Update of /cvsroot/libfunutil/libfunutil/lib/cl
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/lib/cl
Modified Files:
Makefile
Log Message:
fixed a class-renaming snaffu caused by a cross-tree blunder
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/cl/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 17 Nov 2003 20:27:43 -0000 1.2
+++ Makefile 28 Nov 2003 01:35:48 -0000 1.3
@@ -1,33 +1,37 @@
include toc.make
-
# maintenance notes:
-# expected via toc.make:
+# imported via toc:
# $(CL_NAMESPACE)
+# $(LIBCL_CLIENT_LDADD)
# $(LIBCL_LIBNAME)
# $(LIBCL_VERSION)
-# $(LIBCL_CLIENT_LDADD)
CL_NAMESPACE ?= cl
LIBCL_VERSION ?= $(PACKAGE_VERSION)
LIBCL_LIBNAME ?= $(CL_NAMESPACE)_class_loader
-NS_SOURCES = ns.class_loader.cpp \
- ns.path_finder.cpp \
- ns.cl_demo.cpp
+NAMESPACE_PREFIX = src/
-# ns.classname_transformer.cpp
+NS_SOURCES = $(addprefix $(NAMESPACE_PREFIX),\
+ class_loader.cpp \
+ path_finder.cpp \
+ cl_demo.cpp \
+ )
+# $(NAMESPACE_PREFIX)classname_transformer.cpp
-NS_HEADERS = \
- ns.class_loader.h \
- ns.classname_transformer.h \
- ns.context_singleton.h \
- ns.dll_loader.h \
- ns.instantiator.h \
- ns.path_finder.h \
- ns.debuggering_macros.h
+
+NS_HEADERS = $(addprefix $(NAMESPACE_PREFIX),\
+ class_loader.h \
+ classname_transformer.h \
+ context_singleton.h \
+ dll_loader.h \
+ instantiator.h \
+ path_finder.h \
+ debuggering_macros.h \
+ )
DIST_FILES += $(NS_SOURCES) $(NS_HEADERS)
@@ -35,28 +39,35 @@
# want them to be. Simplest is to put everything into NS_{HEADERS/SOURCES} and expect
# them to be filtered by sed.
SOURCES = \
- $(patsubst ns.%,%,$(NS_SOURCES))
+ $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_SOURCES))
HEADERS = \
- $(patsubst ns.%,%,$(NS_HEADERS))
+ $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_HEADERS))
-CLEAN_FILES += $(SOURCES) $(HEADERS) *.o
+CLEAN_FILES += $(SOURCES) $(HEADERS)
NAMESPACE = $(CL_NAMESPACE)
NAMESPACE_TOKEN = CL_NAMESPACE
-NAMESPACE_PREFIX = ns.
-NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS)
+NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
include $(toc_makesdir)/NAMESPACE.make
INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(CL_NAMESPACE)
INSTALL_PACKAGE_HEADERS = $(HEADERS)
-SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
+ifeq (1,0)
+ PRECOMPILED_HEADERS_CXX = $(HEADERS)
+ include $(toc_makesdir)/PCH.make
+ ifeq (1,$(USE_PCH))
+ SYMLINK_HEADERS += $(addsuffix .gch,$(PRECOMPILED_HEADERS_CXX))
+ endif
+else
+ PCH:
+endif
+SYMLINK_HEADERS += $(INSTALL_PACKAGE_HEADERS)
SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(CL_NAMESPACE)
include $(toc_makesdir)/symlink_headers.make
-
OBJECTS = $(addsuffix .o,class_loader path_finder)
@@ -89,7 +100,7 @@
INSTALL_BINS =
# ^^^ we don't want cl_demo installed, and BIN_PROGRAMS does that by default
-all: $(SOURCES) $(HEADERS) symlink-headers deps $(OBJECTS) SHARED_LIBS STATIC_LIBS BIN_PROGRAMS
+all: NAMESPACE 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)
@@ -105,7 +116,5 @@
mv tmp.foo LoadableSubClass.so
# demo app:
-test-.:
+test:
$(RUNTEST)
-
-test: test-. # for compatibility with toc's tests.make :/
|
