X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=Makefile;h=cbdf08e4bdca7590998176dc20577a1a48aaa03a;hp=65a38c776ab333a4923f0138bdd487a14a023562;hb=a315dd546791450a2ee00317938748947632d4f8;hpb=3805b1bec063bfe383e6976135b4bf7dedcd5f5d

diff --git a/Makefile b/Makefile
index 65a38c7..cbdf08e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,36 @@
-VERSION=0.1
+VERSION=0.7
 
-COPTS=-O2
-WOPTS=-pedantic -Wno-unused -Werror
-FPIC=-fPIC
-CFLAGS=$(COPTS) $(WOPTS) -Wall -std=gnu99
+# optional features
+PLUGIN_SUPPORT=1
+DEBUG=0
+DEBUG_TYPECAST=0
+
+include Makefile.inc
 
-AR=ar
-LD=ld
-CC=gcc
 LIBS=-lc
-RANLIB=ranlib
-
-ifneq ($(DEBUG),)
-  COPTS = -O0
-  CFLAGS += -g3 -DDEBUG_ALL
-endif
-OS=$(shell uname)
-ifeq ($(OS),Darwin)
-  SHLIB_EXT=dylib
-  SHLIB_FLAGS=-dylib
-else
-  SHLIB_EXT=so
-  SHLIB_FLAGS=-shared -Wl,soname,$(SHLIB_FILE)
-endif
 SHLIB_FILE=libuci.$(SHLIB_EXT).$(VERSION)
 
-all: uci-static uci libuci.$(SHLIB_EXT)
+define add_feature
+	@echo "$(if $(findstring 1,$($(1))),#define UCI_$(1) 1,#undef UCI_$(1))" >> $@.tmp
+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
+
+cli.o: cli.c uci.h uci_config.h
+ucimap.o: ucimap.c uci.h uci_config.h ucimap.h uci_list.h
 
-cli.o: cli.c uci.h
+uci_config.h: FORCE
+	@rm -f "$@.tmp"
+	$(call add_feature,PLUGIN_SUPPORT)
+	$(call add_feature,DEBUG)
+	$(call add_feature,DEBUG_TYPECAST)
+	@if [ \! -f "$@" ] || ! cmp "$@.tmp" "$@" >/dev/null; then \
+		mv "$@.tmp" "$@"; \
+	else \
+		rm -f "$@.tmp"; \
+	fi
 
 uci: cli.o libuci.$(SHLIB_EXT)
 	$(CC) -o $@ $< -L. -luci
@@ -35,10 +38,10 @@ uci: cli.o libuci.$(SHLIB_EXT)
 uci-static: cli.o libuci.a
 	$(CC) $(CFLAGS) -o $@ $^
 
-libuci-static.o: libuci.c file.c uci.h list.c err.h util.c
+libuci-static.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-libuci-shared.o: libuci.c file.c uci.h list.c err.h util.c
+libuci-shared.o: libuci.c $(LIBUCI_DEPS)
 	$(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
 
 libuci.a: libuci-static.o
@@ -46,9 +49,35 @@ libuci.a: libuci-static.o
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
+libucimap.a: ucimap.o
+	rm -f $@
+	$(AR) rc $@ $^
+	$(RANLIB) $@
+
 libuci.$(SHLIB_EXT): libuci-shared.o
-	$(LD) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
+	$(LINK) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
 	ln -sf $(SHLIB_FILE) $@
 
 clean:
-	rm -f uci uci-static *.[oa] *.so* *.dylib*
+	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h
+
+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)
+	$(MKDIR) -p $(DESTDIR)$(prefix)/bin
+	$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/
+
+test: all
+	make -C test
+
+FORCE: ;
+.PHONY: FORCE