X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=Makefile;h=1397ea50d004cc2ce93db920dfae47d8d2df2429;hp=69a74317010a5b10f1e0cfcd048195503d4bc5f6;hb=6c05c721c77c70f25c46fa20b5d5e4c817e8a651;hpb=bc7d0c4049b516945d4adae203575f8eddd94ce4

diff --git a/Makefile b/Makefile
index 69a7431..1397ea5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.6
+VERSION=0.8
 
 # optional features
 PLUGIN_SUPPORT=1
@@ -7,7 +7,7 @@ DEBUG_TYPECAST=0
 
 include Makefile.inc
 
-LIBS=-lc
+LIBS=-lc -ldl
 SHLIB_FILE=libuci.$(SHLIB_EXT).$(VERSION)
 
 define add_feature
@@ -16,12 +16,14 @@ 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)
+all: uci-static uci libuci.$(SHLIB_EXT) 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
 
 uci_config.h: FORCE
 	@rm -f "$@.tmp"
+	@echo "#define UCI_PREFIX \"$(prefix)\"" > "$@.tmp"
 	$(call add_feature,PLUGIN_SUPPORT)
 	$(call add_feature,DEBUG)
 	$(call add_feature,DEBUG_TYPECAST)
@@ -32,10 +34,10 @@ uci_config.h: FORCE
 	fi
 
 uci: cli.o libuci.$(SHLIB_EXT)
-	$(CC) -o $@ $< -L. -luci
+	$(CC) -o $@ $< -L. -luci $(LIBS)
 
 uci-static: cli.o libuci.a
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 libuci-static.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
@@ -43,17 +45,26 @@ libuci-static.o: libuci.c $(LIBUCI_DEPS)
 libuci-shared.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
 
-libuci.a: libuci-static.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 $@
 	$(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
+	$(CC) $(CFLAGS) -I. -o $@ $^ $(LIBS)
+
 clean:
-	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h
+	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h ucimap-example
 
 install: install-bin install-dev
 
@@ -61,15 +72,16 @@ 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 $(DESTDIR)$(prefix)/include/
+	$(INSTALL) -m0644 uci_config.h uci.h uci_list.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)/bin
 	$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/
 
-test: all
+test: all ucimap-example
 	make -C test
 
 FORCE: ;