X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=7354caf71dcb76156cc2dcdf613ca207f8e60358;hb=fa40c4e16644da1f7c87cbd5a25d3fa8be4e0594;hp=40f28ef3054c4a97d6de624ca023be1696a017b5;hpb=034d6a865d55fbdab0d53f8f47ca0ce706b8e69a;p=project%2Fuci.git

diff --git a/Makefile b/Makefile
index 40f28ef..7354caf 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) libucimap.a
+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,27 +49,22 @@ 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
+ucimap-shared.o: ucimap.c $(LIBUCI_DEPS) ucimap.h
 
-libuci.a: libuci-static.o
+libuci.a: libuci-static.o ucimap-static.o
 	rm -f $@
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-libucimap.a: ucimap.o
-	rm -f $@
-	$(AR) rc $@ $^
-	$(RANLIB) $@
-
-libuci.$(SHLIB_EXT): libuci-shared.o
+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 libucimap.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
@@ -68,15 +72,15 @@ clean:
 install: install-bin install-dev
 
 install-dev: all
-	$(MKDIR) -p $(DESTDIR)$(prefix)/lib
+	$(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)
 	$(MKDIR) -p $(DESTDIR)$(prefix)/include
-	$(INSTALL) -m0644 libuci.a libucimap.a $(DESTDIR)$(prefix)/lib/
-	$(INSTALL) -m0644 uci_config.h uci.h uci_list.h ucimap.h $(DESTDIR)$(prefix)/include/
+	$(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/$(LIBDIRNAME)/
+	$(INSTALL) -m0644 uci_config.h uci.h ucimap.h $(DESTDIR)$(prefix)/include/
 
 install-bin: all
-	$(MKDIR) -p $(DESTDIR)$(prefix)/lib
-	$(INSTALL) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/
-	ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/libuci.$(SHLIB_EXT)
+	$(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)
+	$(INSTALL) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/$(LIBDIRNAME)/
+	ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/$(LIBDIRNAME)/libuci.$(SHLIB_EXT)
 	$(MKDIR) -p $(DESTDIR)$(prefix)/bin
 	$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/