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

diff --git a/Makefile b/Makefile
index 421c2d9..3e1d7ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,13 @@
-VERSION=0.3
+VERSION=0.6
 
 # optional features
 PLUGIN_SUPPORT=1
 DEBUG=0
 DEBUG_TYPECAST=0
 
-prefix=/usr
-DESTDIR=
+include Makefile.inc
 
-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
 SHLIB_FILE=libuci.$(SHLIB_EXT).$(VERSION)
 
 define add_feature
@@ -82,10 +56,15 @@ clean:
 	rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h
 
 install: 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)
-	$(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