Update of /cvsroot/libfunutil/libfunutil/lib/s11n
In directory sc8-pr-cvs1:/tmp/cvs-serv20054
Modified Files:
Makefile Serializable.h
Log Message:
WTF? Fixed some link-related weirdness
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 14 Oct 2003 03:38:14 -0000 1.3
+++ Makefile 17 Oct 2003 09:08:02 -0000 1.4
@@ -40,9 +40,9 @@
top_srcdir_absolute = $(shell cd $(top_srcdir) && pwd)
# CPPFLAGS += -DDLLLOADER_DEFAULT_PATH=\".:$(top_srcdir_absolute)/lib/s11n:$(prefix)/lib\"
-OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES))
-PARSER_OBJECTS = $(addprefix parsers/,flex_lexers.o funtxt.flex.o funxml.flex.o select_lexer.flex.o simplexml.flex.o)
-
+PARSER_OBJECTS = $(addprefix parsers/,compact.flex.o flex_lexers.o \
+ funtxt.flex.o funxml.flex.o hex.flex.o paren.flex.o \
+ select_lexer.flex.o simplexml.flex.o)
INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/s11n
INSTALL_PACKAGE_HEADERS = $(HEADERS)
@@ -72,8 +72,8 @@
# build, requiring a sub-make (after building SUBDIRS) to get the
# proper values here:
OBJECTS_TOOLBOX = $(wildcard $(top_libdir)/toolbox/*.o)
-OBJECTS_S11N = $(wildcard *.o parsers/*.o)
-OBJECTS = $(OBJECTS_TOOLBOX) $(OBJECTS_S11N)
+OBJECTS_S11N = $(patsubst %.cpp,%.o,$(SOURCES)) $(PARSER_OBJECTS)
+# OBJECTS = $(OBJECTS_TOOLBOX) $(OBJECTS_S11N)
############################## static libs
STATIC_LIBS = libs11n
@@ -91,7 +91,7 @@
-all: symlink-headers subdir-parsers $(OBJECTS)
+all: symlink-headers subdir-parsers
@${MAKE} --no-print-directory STATIC_LIBS SHARED_LIBS $(ENM_NAMESFILE)
# sub-make needed to get .o files which didn't exist when build started :/
Index: Serializable.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/Serializable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Serializable.h 14 Oct 2003 20:42:30 -0000 1.2
+++ Serializable.h 17 Oct 2003 09:08:02 -0000 1.3
@@ -6,9 +6,9 @@
#ifndef SERIALIZABLE_H_INCLUDED
#define SERIALIZABLE_H_INCLUDED
#include <string>
-
+#include <s11n/s11n_node.h> // note: gcc 3.3pre doesn't need this, gcc 3.3.1 does
namespace s11n {
- class s11n_node; // forward decl
+// class s11n_node; // forward decl
/**
Serializable plays several roles:
@@ -98,6 +98,7 @@
#include <s11n/serializable_adapter.h>
+
SERIALIZABLE_ADAPTER(s11n::Serializable,s7e,d9e); // this is the
// only sane place to put this, i think?
|
