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

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

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

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

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/cl/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	29 Nov 2003 13:47:12 -0000	1.4
+++ Makefile	10 Dec 2003 21:14:38 -0000	1.5
@@ -52,7 +52,17 @@
 NAMESPACE = $(CL_NAMESPACE)
 NAMESPACE_TOKEN = CL_NAMESPACE
 NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
-include $(toc_makesdir)/NAMESPACE.make
+# include $(TOC_MAKESDIR)/NAMESPACE.make
+
+FILE_FILTERS = namespace
+namespace_FILTER_RULES = -e 's|CL_NAMESPACE|$(CL_NAMESPACE)|g'
+namespace_FILTER_SOURCES = $(wildcard src/*.cpp src/*.h)
+namespace_FILTER_NAMESED = s,src/,,
+namespace-notice:
+	@echo "Package namespace is $(CL_NAMESPACE)."
+FILE_FILTERS: namespace-notice
+include $(TOC_MAKESDIR)/FILE_FILTERS.make
+
 
 
 INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(CL_NAMESPACE)
@@ -60,7 +70,7 @@
 
 ifeq (1,0)
   PRECOMPILED_HEADERS_CXX = $(HEADERS)
-  include $(toc_makesdir)/PCH.make
+  include $(TOC_MAKESDIR)/PCH.make
   ifeq (1,$(USE_PCH))
     SYMLINK_HEADERS += $(addsuffix .gch,$(PRECOMPILED_HEADERS_CXX))
   endif
@@ -69,7 +79,7 @@
 endif
 SYMLINK_HEADERS += $(INSTALL_PACKAGE_HEADERS)
 SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(CL_NAMESPACE)
-include $(toc_makesdir)/symlink_headers.make
+include $(TOC_MAKESDIR)/symlink_headers.make
 
 OBJECTS = $(addsuffix .o,class_loader path_finder)
 
@@ -86,10 +96,9 @@
 # LoadableClass_so_LDADD = $(LIBCL_CLIENT_LDADD)
 LoadableSubClass_so_OBJECTS = LoadableSubClass.o
 LoadableSubClass_so_LDADD = $(LIBCL_CLIENT_LDADD)
-DIST_FILES += LoadableSubClass.cpp LoadableClass.h LoadableClass.cpp
 
-include $(toc_makesdir)/SHARED_LIBS.make
-include $(toc_makesdir)/STATIC_LIBS.make
+include $(TOC_MAKESDIR)/SHARED_LIBS.make
+include $(TOC_MAKESDIR)/STATIC_LIBS.make
 
 INSTALL_LIBEXECS = lib$(LIBCL_LIBNAME).so.$(lib$(LIBCL_LIBNAME)_so_VERSION)
 # ^^^ re-set the list to remove Loadable*.*, which are automatically added by SHARED_LIBS
@@ -98,12 +107,12 @@
 test_cl_bin_OBJECTS = cl_demo.o LoadableClass.o
 cl_demo_cpp_CPPFLAGS += -DCLASSLOADER_DEBUG=1
 test_cl_bin_LDADD = $(LIBCL_CLIENT_LDADD)
-include $(toc_makesdir)/BIN_PROGRAMS.make
+include $(TOC_MAKESDIR)/BIN_PROGRAMS.make
 
 INSTALL_BINS =
 # ^^^ we don't want cl_demo installed, and BIN_PROGRAMS does that by default
 
-all: NAMESPACE PCH symlink-headers deps $(OBJECTS) SHARED_LIBS STATIC_LIBS BIN_PROGRAMS
+all: FILE_FILTERS PCH symlink-headers deps $(OBJECTS) SHARED_LIBS STATIC_LIBS BIN_PROGRAMS
 	@echo "When running the test_cl binary be sure to set your LD_LIBRARY_PATH to include ${PWD}!"
 	@echo "Running the 'test' target does this for you."
 # $(ENM_NAMESFILE)