[fU-cvs] libfunutil/lib/toolbox Makefile,1.4,1.5

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/lib/toolbox
In directory sc8-pr-cvs1:/tmp/cvs-serv32211/lib/toolbox

Modified Files:
	Makefile 
Log Message:
mass commit: an absolute boatload of build-related fixes.

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	28 Nov 2003 01:35:49 -0000	1.4
+++ Makefile	10 Dec 2003 21:14:39 -0000	1.5
@@ -1,13 +1,19 @@
+#!/usr/bin/make
 
 include toc.make
 
-# maintenance notes:
-#  imported via toc:
+#########################
+# Maintenance notes:
+#  expected via toc:
 #   $(TOOLBOX_NAMESPACE)
 
 TOOLBOX_NAMESPACE ?= toolbox
 
-NAMESPACE_PREFIX = src/
+################ the real sources are stored here:
+  NAMESPACE_PREFIX = src/
+################ and the namespace is filtered out via FILE_FILTERS.
+
+NAMESPACE = $(TOOLBOX_NAMESPACE)
 
 NS_SOURCES = $(addprefix $(NAMESPACE_PREFIX),\
 	argv_parser.cpp \
@@ -22,6 +28,7 @@
 
 
 NS_HEADERS = $(addprefix $(NAMESPACE_PREFIX),\
+	aliaser.h \
 	any.h \
 	argv_parser.h \
 	children_holder.h \
@@ -40,24 +47,51 @@
 	)
 
 
-#ifeq (1,$(configure_enable_zlib))
-NS_SOURCES += $(NAMESPACE_PREFIX)gzstream.cpp
-NS_HEADERS += $(NAMESPACE_PREFIX)gzstream.h
-#endif
-#ifeq (1,$(configure_enable_bzlib))
-NS_SOURCES += $(NAMESPACE_PREFIX)bzstream.cpp
-NS_HEADERS += $(NAMESPACE_PREFIX)bzstream.h
-#endif
+################################# got zlib?
+configure_enable_zlib ?= $(HAVE_ZLIB)
+GZ_CPP = $(NAMESPACE_PREFIX)gzstream.cpp
+GZ_H = $(NAMESPACE_PREFIX)gzstream.h
+ifeq (1,$(configure_enable_zlib))
+zlib:
+	@echo "FYI: zlib support is enabled."
+    NS_SOURCES += $(GZ_CPP)
+    NS_HEADERS += $(GZ_H)
+else
+zlib:
+	@echo "FYI: zlib support is DISABLED."
+    DIST_FILES += $(GZ_CPP) $(GZ_H)
+endif
+################################# /zlib
+
+################################## got bzip?
+configure_enable_bzlib ?= $(HAVE_BZLIB)
+BZ_CPP = $(NAMESPACE_PREFIX)bzstream.cpp
+BZ_H = $(NAMESPACE_PREFIX)bzstream.h
+ifeq (1,$(configure_enable_bzlib))
+bzlib:
+	@echo "FYI: bz2lib support is enabled."
+    NS_SOURCES += $(BZ_CPP)
+    NS_HEADERS += $(BZ_H)
+else
+bzlib:
+	@echo "FYI: bz2lib support is DISABLED."
+    DIST_FILES += $(BZ_CPP) $(BZ_H)
+endif
+################################# /bzip
+
 
 SOURCES = $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_SOURCES))
 HEADERS = $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_HEADERS))
-CLEAN_FILES += $(SOURCES) $(HEADERS)
 
 
-NAMESPACE = $(TOOLBOX_NAMESPACE)
-NAMESPACE_TOKEN = TOOLBOX_NAMESPACE
-NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
-include $(toc_makesdir)/NAMESPACE.make
+FILE_FILTERS = namespace
+namespace_FILTER_RULES = -e 's|TOOLBOX_NAMESPACE|$(TOOLBOX_NAMESPACE)|g'
+namespace_FILTER_NAMESED = s,$(NAMESPACE_PREFIX),,
+namespace_FILTER_SOURCES = $(NS_SOURCES) $(NS_HEADERS)
+namespace-notice:
+	@echo "Package namespace is $(TOOLBOX_NAMESPACE)."
+FILE_FILTERS: namespace-notice
+include $(TOC_MAKESDIR)/FILE_FILTERS.make
 
 
 top_srcdir_absolute = $(shell cd $(top_srcdir) && pwd)
@@ -74,16 +108,16 @@
 		"EDIT AT YOUR OWN RISK!\n" \
 		"***********************************************************************/" > $@
 	@echo "Creating printf implementations..."
-	$(PERL_BIN) ./makePrintf $(EPRINTF_COUNT) >> $@
+	$(PERL_BIN) ./makePrintf $(EPRINTF_COUNT) $(TOOLBOX_NAMESPACE) >> $@
 
 
 
 INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(TOOLBOX_NAMESPACE)
-INSTALL_PACKAGE_HEADERS = $(HEADERS) $(EPRINTF)
+INSTALL_PACKAGE_HEADERS += $(HEADERS) $(EPRINTF)
 
 SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
 SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(TOOLBOX_NAMESPACE)
-include $(toc_makesdir)/symlink_headers.make
+include $(TOC_MAKESDIR)/symlink_headers.make
 
 
 OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES))
@@ -91,10 +125,5 @@
 
 DIST_FILES += $(NS_SOURCES) $(NS_HEADERS) makePrintf class_names
 
-# DIST_FILES += LoadableClass.cpp LoadableClass.h LoadableSubClass.cpp
-
-
-all: $(SOURCES) $(HEADERS) $(EPRINTF) symlink-headers $(OBJECTS)
-# SHARED_LIBS
-# $(ENM_NAMESFILE)
+all: FILE_FILTERS $(EPRINTF) symlink-headers zlib bzlib $(OBJECTS)