X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=Makefile;h=57c0f0ba47cb01cfec316e0c7c6d79dbba88c53a;hp=3e1d7ac74f3175a69e845454bbbae6737d61319a;hb=2be6befa78ee4b38681d23a9772434314eec3cf8;hpb=213d8d8934f797849eb80b7ac06b6d37f3090e40

diff --git a/Makefile b/Makefile
index 3e1d7ac..57c0f0b 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) libucimap.a
 
 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 $@ $<
@@ -48,22 +50,37 @@ libuci.a: libuci-static.o
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
+libucimap.a: ucimap.o
+	rm -f $@
+	$(AR) rc $@ $^
+	$(RANLIB) $@
+
 libuci.$(SHLIB_EXT): libuci-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 $@ $^
+
 clean:
 	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h
 
-install: all
+install: install-bin install-dev
+
+install-dev: all
+	$(MKDIR) -p $(DESTDIR)$(prefix)/lib
+	$(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-bin: all
 	$(MKDIR) -p $(DESTDIR)$(prefix)/lib
-	$(INSTALL) -m0644 libuci.a $(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: ;