base-files: fix brcm-2.4 issues in r26991

[openwrt-10.03/.git] / package / nvram / src / Makefile

diff --git a/package/nvram/src/Makefile b/package/nvram/src/Makefile
index 144499ca652ac16b6358639d60ee77219c4bf66c..4872728baf6ce399b09af4533beb6fbb39f3e116 100644 (file)
--- a/package/nvram/src/Makefile
+++ b/package/nvram/src/Makefile
@@ -1,16 +1,33 @@
+CLI_FILENAME = nvram
 
-LIBNVRAM_OBJS := nvram.o
+LIB_VERMAJOR = 0
+LIB_VERMINOR = 1
+LIB_FILENAME = libnvram.so
 
-all: libnvram.so nvram
+LIB_CFLAGS  = $(CFLAGS) -shared -fPIC
+LIB_LDFLAGS = $(LDFLAGS) -Wl,-soname,$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -I. -Iinclude -o $@ $^
+CLI_CFLAGS  = $(CFLAGS)
+CLI_LDFLAGS = $(LDFLAGS)
 
-libnvram.so: $(LIBNVRAM_OBJS)
-       $(CC) -shared -o $@ $^
+CLI_OBJ = cli.o
+LIB_OBJ = crc.o nvram.o
 
-nvram: main.o
-       $(CC) -o $@ $^ -L. -lnvram
+all: cli libnvram
+
+cli: libnvram
+       $(CC) $(CLI_CFLAGS) -c -o cli.o cli.c
+       $(CC) -o $(CLI_FILENAME) $(CLI_LDFLAGS) $(CLI_OBJ) \
+               $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
+
+cli.o: cli.c
+       $(CC) $(CLI_CFLAGS) -c -o $@ $<
+
+libnvram:
+       $(CC) $(LIB_CFLAGS) -c -o crc.o crc.c
+       $(CC) $(LIB_CFLAGS) -c -o nvram.o nvram.c
+       $(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) \
+               -o $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR) $(LIB_OBJ)
 
 clean:
-       rm -f *.o *.so nvram
+       rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o