X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=c4d857714fd9feb94d3926d43b20e87bb512204f;hb=6d75ac9588e1aa3a85dd85d121978e9d99531ac4;hp=ea7d5c7b6560dc4bb4449ca4528725c5fcb8504a;hpb=015921f9cded4fd53fc71c9ceeff3e2c70029dc1;p=project%2Fuci.git

diff --git a/Makefile b/Makefile
index ea7d5c7..c4d8577 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.5
+VERSION=0.7
 
 # 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,6 +50,11 @@ 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) $@
@@ -55,11 +62,23 @@ libuci.$(SHLIB_EXT): libuci-shared.o
 clean:
 	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h
 
-install: all
-	$(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/lib/
+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) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/
 	ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/libuci.$(SHLIB_EXT)
-	$(INSTALL) -m0755 uci $(DESTDIR)/usr/bin/
+	$(MKDIR) -p $(DESTDIR)$(prefix)/bin
+	$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/
+
+test: all
+	make -C test
 
 FORCE: ;
 .PHONY: FORCE