X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=Makefile;h=11bb472bd63d4fada38667fc53e9d2ba5122aef5;hb=c81b25ffd34632dc6ac56fe61faaf44eca822259;hp=1397ea50d004cc2ce93db920dfae47d8d2df2429;hpb=ba0d03d0cca59b5b8d30f4844d9eb9ec3e87c69a;p=uci.git

diff --git a/Makefile b/Makefile
index 1397ea5..11bb472 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ endef
 
 LIBUCI_DEPS=file.c history.c list.c util.c uci.h uci_config.h uci_internal.h
 
-all: uci-static uci libuci.$(SHLIB_EXT) ucimap-example
+all: uci libuci.$(SHLIB_EXT) uci-static ucimap-example
 
 cli.o: cli.c uci.h uci_config.h
-ucimap.o: ucimap.c uci.h uci_config.h ucimap.h uci_list.h
+ucimap.o: ucimap.c uci.h uci_config.h ucimap.h
 
 uci_config.h: FORCE
 	@rm -f "$@.tmp"
@@ -33,6 +33,15 @@ uci_config.h: FORCE
 		rm -f "$@.tmp"; \
 	fi
 
+%.o: %.c
+	$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
+
+%-shared.o: %.c
+	$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(FPIC) $<
+
+%-static.o: %.c
+	$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
+
 uci: cli.o libuci.$(SHLIB_EXT)
 	$(CC) -o $@ $< -L. -luci $(LIBS)
 
@@ -40,16 +49,9 @@ uci-static: cli.o libuci.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 libuci-static.o: libuci.c $(LIBUCI_DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 libuci-shared.o: libuci.c $(LIBUCI_DEPS)
-	$(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
-
 ucimap-static.o: ucimap.c $(LIBUCI_DEPS) ucimap.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 ucimap-shared.o: ucimap.c $(LIBUCI_DEPS) ucimap.h
-	$(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
 
 libuci.a: libuci-static.o ucimap-static.o
 	rm -f $@
@@ -60,8 +62,9 @@ libuci.$(SHLIB_EXT): libuci-shared.o ucimap-shared.o
 	$(LINK) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
 	ln -sf $(SHLIB_FILE) $@
 
-ucimap-example: ucimap-example.c libuci.a
-	$(CC) $(CFLAGS) -I. -o $@ $^ $(LIBS)
+ucimap-example.o: ucimap-example.c list.h
+ucimap-example: ucimap-example.o libuci.a
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h ucimap-example
@@ -72,7 +75,7 @@ install-dev: all
 	$(MKDIR) -p $(DESTDIR)$(prefix)/lib
 	$(MKDIR) -p $(DESTDIR)$(prefix)/include
 	$(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/lib/
-	$(INSTALL) -m0644 uci_config.h uci.h uci_list.h ucimap.h $(DESTDIR)$(prefix)/include/
+	$(INSTALL) -m0644 uci_config.h uci.h ucimap.h $(DESTDIR)$(prefix)/include/
 
 install-bin: all
 	$(MKDIR) -p $(DESTDIR)$(prefix)/lib