X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=Makefile;h=7ac23850950c47cf9fd9f504ed79fc0e62f63184;hp=2a072c4f30fc75c940859c0ff7e52fc5ab881d26;hb=4e55f6b3829420be74d35db2e55bafb18ac8ce21;hpb=c065d5043c892dcdee5ec10e65044f506e30e8eb;ds=sidebyside

diff --git a/Makefile b/Makefile
index 2a072c4..7ac2385 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-VERSION=0.1
+VERSION=0.3
 
 COPTS=-O2
 WOPTS=-pedantic -Wno-unused -Werror
 FPIC=-fPIC
-CFLAGS=$(COPTS) -Wall -std=gnu99
+CFLAGS=$(COPTS) $(WOPTS) -Wall -std=gnu99
 
 AR=ar
 LD=ld
@@ -17,14 +17,18 @@ ifneq ($(DEBUG),)
 endif
 OS=$(shell uname)
 ifeq ($(OS),Darwin)
+  LINK=$(LD)
   SHLIB_EXT=dylib
   SHLIB_FLAGS=-dylib
 else
+  LINK=$(CC)
   SHLIB_EXT=so
-  SHLIB_FLAGS=-shared -Wl,soname,$(SHLIB_FILE)
+  SHLIB_FLAGS=-shared -Wl,-soname,$(SHLIB_FILE)
 endif
 SHLIB_FILE=libuci.$(SHLIB_EXT).$(VERSION)
 
+LIBUCI_DEPS=file.c history.c list.c util.c uci.h uci_internal.h
+
 all: uci-static uci libuci.$(SHLIB_EXT)
 
 cli.o: cli.c uci.h
@@ -35,10 +39,10 @@ uci: cli.o libuci.$(SHLIB_EXT)
 uci-static: cli.o libuci.a
 	$(CC) $(CFLAGS) -o $@ $^
 
-libuci-static.o: libuci.c file.c uci.h list.c err.h util.c
+libuci-static.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-libuci-shared.o: libuci.c file.c uci.h list.c err.h util.c
+libuci-shared.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
 
 libuci.a: libuci-static.o
@@ -47,7 +51,7 @@ libuci.a: libuci-static.o
 	$(RANLIB) $@
 
 libuci.$(SHLIB_EXT): libuci-shared.o
-	$(LD) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
+	$(LINK) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
 	ln -sf $(SHLIB_FILE) $@
 
 clean: