projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uci_history -> uci_delta
[project/uci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6907172
..
9f5b313
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,12
+14,19
@@
define add_feature
@echo "$(if $(findstring 1,$($(1))),#define UCI_$(1) 1,#undef UCI_$(1))" >> $@.tmp
endef
@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
+define add_dep
+$(1).shared.o: $(2)
+$(1).static.o: $(2)
+endef
+
+SOURCES = libuci.c file.c ucimap.c util.c
+
+all: uci libuci.$(SHLIB_EXT) uci-static ucimap-example
-all: uci-static uci libuci.$(SHLIB_EXT)
+$(eval $(call add_dep,libuci,delta.c list.c uci.h uci_config.h uci_internal.h))
+$(eval $(call add_dep,ucimap,uci.h uci_config.h ucimap.h))
cli.o: cli.c uci.h uci_config.h
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"
uci_config.h: FORCE
@rm -f "$@.tmp"
@@
-33,35
+40,35
@@
uci_config.h: FORCE
rm -f "$@.tmp"; \
fi
rm -f "$@.tmp"; \
fi
+%.o: %.c
+ $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
+
+%.static.o: %.c
+ $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
+
+%.shared.o: %.c
+ $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(FPIC) $<
+
uci: cli.o libuci.$(SHLIB_EXT)
$(CC) -o $@ $< -L. -luci $(LIBS)
uci-static: cli.o libuci.a
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
uci: cli.o libuci.$(SHLIB_EXT)
$(CC) -o $@ $< -L. -luci $(LIBS)
uci-static: cli.o libuci.a
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-libuci-static.o: libuci.c $(LIBUCI_DEPS)
- $(CC) $(CFLAGS) -c -o $@ $<
-
-libuci-shared.o: libuci.c $(LIBUCI_DEPS)
- $(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
-
-ucimap-static.o: ucimap.c $(LIBUCI_DEPS)
- $(CC) $(CFLAGS) -c -o $@ $<
+ucimap.c: ucimap.h uci.h
-ucimap-shared.o: ucimap.c $(LIBUCI_DEPS)
- $(CC) $(CFLAGS) $(FPIC) -c -o $@ $<
-
-libuci.a: libuci-static.o ucimap-static.o
+libuci.a: $(patsubst %.c,%.static.o, $(SOURCES))
rm -f $@
$(AR) rc $@ $^
$(RANLIB) $@
rm -f $@
$(AR) rc $@ $^
$(RANLIB) $@
-libuci.$(SHLIB_EXT):
libuci-shared.o ucimap-shared.o
+libuci.$(SHLIB_EXT):
$(patsubst %.c,%.shared.o, $(SOURCES))
$(LINK) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
ln -sf $(SHLIB_FILE) $@
$(LINK) $(SHLIB_FLAGS) -o $(SHLIB_FILE) $^ $(LIBS)
ln -sf $(SHLIB_FILE) $@
-ucimap-example: ucimap-example.c libuci.a
- $(CC) $(CFLAGS) -I. -o $@ $^ $(LIBS)
+ucimap-example.c: list.h
+ucimap-example: ucimap-example.o libuci.a
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
clean:
rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h ucimap-example
clean:
rm -f uci uci-static *.[oa] *.so* *.dylib* uci_config.h ucimap-example
@@
-69,15
+76,15
@@
clean:
install: install-bin install-dev
install-dev: all
install: install-bin install-dev
install-dev: all
- $(MKDIR) -p $(DESTDIR)$(prefix)/
lib
+ $(MKDIR) -p $(DESTDIR)$(prefix)/
$(LIBDIRNAME)
$(MKDIR) -p $(DESTDIR)$(prefix)/include
$(MKDIR) -p $(DESTDIR)$(prefix)/include
- $(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/
lib
/
- $(INSTALL) -m0644 uci_config.h uci.h uci
_list.h uci
map.h $(DESTDIR)$(prefix)/include/
+ $(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/
$(LIBDIRNAME)
/
+ $(INSTALL) -m0644 uci_config.h uci.h ucimap.h $(DESTDIR)$(prefix)/include/
install-bin: all
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)/
$(LIBDIRNAME)
+ $(INSTALL) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/
$(LIBDIRNAME)
/
+ ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/
$(LIBDIRNAME)
/libuci.$(SHLIB_EXT)
$(MKDIR) -p $(DESTDIR)$(prefix)/bin
$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/
$(MKDIR) -p $(DESTDIR)$(prefix)/bin
$(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/