From: stephan b. <sg...@us...> - 2004-12-29 20:12:00
|
Update of /cvsroot/pclasses/pclasses2/src/s11n/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17094/src/s11n/io Modified Files: Makefile.toc serializers.h Log Message: Mass commit: lots of -l/-L linker changes/fixes. Index: Makefile.toc =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/io/Makefile.toc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.toc 27 Dec 2004 18:06:00 -0000 1.3 +++ Makefile.toc 29 Dec 2004 20:11:20 -0000 1.4 @@ -2,7 +2,7 @@ include toc.make -SUBDIRS = expat parens +# SUBDIRS = expat parens HEADERS = \ data_node_format.h \ @@ -13,19 +13,21 @@ DIST_FILES += $(HEADERS) +LDFLAGS += $(P_BACKLINK_LDADD) + INSTALL_PACKAGE_HEADERS += $(HEADERS) INSTALL_PACKAGE_HEADERS_DEST = $(INSTALL_PACKAGE_HEADERS_BASE)/s11n/io SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS) SYMLINK_HEADERS_DEST = $(top_srcdir)/include/pclasses/s11n/io include $(TOC_MAKESDIR)/SYMLINK_HEADERS.make -SOURCES = data_node_io.cpp +SOURCES = \ + data_node_io.cpp + DIST_FILES += $(SOURCES) -OBJECTS = data_node_io.o +OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES)) CLEAN_FILES += $(OBJECTS) -all: SYMLINK_HEADERS subdirs $(OBJECTS) - - +all: SYMLINK_HEADERS $(OBJECTS) Index: serializers.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/io/serializers.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serializers.h 26 Dec 2004 09:16:27 -0000 1.3 +++ serializers.h 29 Dec 2004 20:11:20 -0000 1.4 @@ -126,7 +126,10 @@ // CERR << "register_serializer(" << classname << ","<<alias<<")\n"; PM.registerFactory( classname, FACCREATE ); - PM.alias( alias, classname ); + if( ! alias.empty() ) + { + PM.alias( alias, classname ); + } PM.alias( ST().magic_cookie(), classname ); #undef PM #undef FACCREATE |