X-Git-Url: http://git.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=Makefile;h=c4d857714fd9feb94d3926d43b20e87bb512204f;hp=421c2d9c27f7141015c205e860f6e83eadd28f5a;hb=93da237dc09c31ef3c6db462de0845addf8a87f6;hpb=66311debd9b145ae37087df7c7f3ed16a3852090

diff --git a/Makefile b/Makefile
index 421c2d9..c4d8577 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,13 @@
-VERSION=0.3
+VERSION=0.7
 
 # optional features
 PLUGIN_SUPPORT=1
 DEBUG=0
 DEBUG_TYPECAST=0
 
-prefix=/usr
-DESTDIR=
-
-COPTS=-O2
-WOPTS=-pedantic -Wno-unused -Werror
-FPIC=-fPIC
-CFLAGS=$(COPTS) $(WOPTS) -Wall -std=gnu99
-
-AR=ar
-LD=ld
-CC=gcc
-LIBS=-lc
-RANLIB=ranlib
-INSTALL=install
-
-ifeq ($(DEBUG),1)
-  COPTS = -O0
-  CFLAGS += -g3
-endif
-OS=$(shell uname)
-ifeq ($(OS),Darwin)
-  LINK=$(LD)
-  SHLIB_EXT=dylib
-  SHLIB_FLAGS=-dylib
-else
-  LINK=$(CC)
-  SHLIB_EXT=so
-  SHLIB_FLAGS=-shared -Wl,-soname,$(SHLIB_FILE)
-endif
+include Makefile.inc
+
+LIBS=-lc -ldl
 SHLIB_FILE=libuci.$(SHLIB_EXT).$(VERSION)
 
 define add_feature
@@ -42,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)
@@ -58,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 $@ $<
@@ -74,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) $@
@@ -81,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