The $(LIBxxx) mechanism proved useful, so I'm switching to it for all other

libraries to simplify the Makefiles a bit. Unfortunately, this introduces
ugly ordering constraints on includes in top-level Makefile, but they can
be lived with.

diff --git a/charset/Makefile b/charset/Makefile
index 5f6f500a20d33224b58bc047e907f1afb3740296..a708074557481e683ab0cf3efdd9873f4aefa77d 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -4,6 +4,7 @@ DIRS+=charset
 
 LIBCHARSET_MODS=toupper tolower tocat utf8 unaccent strlen debug \
        charconv setnames unistream
+LIBCHARSET=obj/charset/libcharset.$(LS)
 
 obj/charset/libcharset.a: $(addsuffix .o,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
 obj/charset/libcharset.so: $(addsuffix .oo,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))

diff --git a/lib/Makefile b/lib/Makefile
index 8b50a964f2f24116871a56c04f3e361e4424214e..48abd228acfc2494c33a97c42718424f03c578b1 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -16,16 +16,16 @@ obj/lib/libsh.so: $(addsuffix .oo,$(LIBSH_MOD_PATHS))
 
 obj/lib/hashfunc.o obj/lib/hashfunc.oo: CFLAGS += -funroll-loops
 
-obj/lib/db-test: obj/lib/db-test.o obj/lib/libsh.$(LS)
-obj/lib/db-tool: obj/lib/db-tool.o obj/lib/libsh.$(LS)
-obj/lib/buckettool: obj/lib/buckettool.o obj/lib/libsh.$(LS)
-obj/lib/conf-test: obj/lib/conf-test.o obj/lib/libsh.$(LS)
-obj/lib/sort-test: obj/lib/sort-test.o obj/lib/libsh.$(LS)
-obj/lib/lfs-test: obj/lib/lfs-test.o obj/lib/libsh.$(LS)
-obj/lib/regex-test: obj/lib/regex-test.o obj/lib/libsh.$(LS)
-obj/lib/hash-test: obj/lib/hash-test.o obj/lib/libsh.$(LS)
-obj/lib/str-test: obj/lib/str-test.o obj/lib/libsh.$(LS)
-obj/lib/asort-test: obj/lib/asort-test.o obj/lib/libsh.$(LS)
+obj/lib/db-test: obj/lib/db-test.o $(LIBSH)
+obj/lib/db-tool: obj/lib/db-tool.o $(LIBSH)
+obj/lib/buckettool: obj/lib/buckettool.o $(LIBSH)
+obj/lib/conf-test: obj/lib/conf-test.o $(LIBSH)
+obj/lib/sort-test: obj/lib/sort-test.o $(LIBSH)
+obj/lib/lfs-test: obj/lib/lfs-test.o $(LIBSH)
+obj/lib/regex-test: obj/lib/regex-test.o $(LIBSH)
+obj/lib/hash-test: obj/lib/hash-test.o $(LIBSH)
+obj/lib/str-test: obj/lib/str-test.o $(LIBSH)
+obj/lib/asort-test: obj/lib/asort-test.o $(LIBSH)
 
 include lib/perl/Makefile
 include lib/shell/Makefile

diff --git a/lib/shell/Makefile b/lib/shell/Makefile
index e32192127889787e5fcbe58eeccf4df89cf80117..14e4901380091ff0a89941391edd07a0488d9ce9 100644 (file)
--- a/lib/shell/Makefile
+++ b/lib/shell/Makefile
@@ -3,5 +3,5 @@
 DIRS+=lib/shell
 PROGS+=obj/lib/shell/config obj/lib/shell/logger
 
-obj/lib/shell/config: obj/lib/shell/config.o obj/lib/libsh.$(LS)
-obj/lib/shell/logger: obj/lib/shell/logger.o obj/lib/libsh.$(LS)
+obj/lib/shell/config: obj/lib/shell/config.o $(LIBSH)
+obj/lib/shell/logger: obj/lib/shell/logger.o $(LIBSH)