squashfs4: refresh the cygwin patch

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

diff --git a/package/nvram/src/Makefile b/package/nvram/src/Makefile
index 3d98209..4872728 100644 (file)
--- a/package/nvram/src/Makefile
+++ b/package/nvram/src/Makefile
@@ -1,21 +1,33 @@
-# $Id$
+CLI_FILENAME = nvram

 
 

-LIBSHARED_OBJS := shutils.o wl.o wl_linux.o defaults.o linux_timer.o
-LIBNVRAM_OBJS := nvram_linux.o nvram_convert.o
+LIB_VERMAJOR = 0
+LIB_VERMINOR = 1
+LIB_FILENAME = libnvram.so

 
 

-all: libshared.so 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)

 
 

-libshared.so: $(LIBSHARED_OBJS)
-       $(CC) -shared -o $@ $^
+CLI_OBJ = cli.o
+LIB_OBJ = crc.o nvram.o

 
 

-libnvram.so: $(LIBNVRAM_OBJS)
-       $(CC) -shared -o $@ $^
+all: cli libnvram

 
 

-nvram: main.o
-       $(CC) -o $@ $^ -L. -lnvram
+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:
 
 clean:

-       rm -f *.o *.so nvram
+       rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o