OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Dec-2002 17:54:14
Branch: HEAD Handle: 2002121716541400
Added files:
openpkg-src/xalan-c xalan-c.patch
Log:
platform/linker patch
Summary:
Revision Changes Path
1.1 +361 -0 openpkg-src/xalan-c/xalan-c.patch
____________________________________________________________________________
Index: openpkg-src/xalan-c/xalan-c.patch
============================================================
$ cvs update -p -r1.1 xalan-c.patch
--- c/src/Makefile.in.dist Thu Dec 12 13:14:03 2002
+++ c/src/Makefile.in Fri Dec 13 11:06:53 2002
@@ -143,8 +143,9 @@
ifeq ($(PLATFORM), LINUX)
SUPPORTED = TRUE
- ALLLIBS = ${LIBS} -L/usr/lib
+ ALLLIBS = ${LIBS}
SHLIBSUFFIX=.so
+ LIBSUFFIX=.a
PIC_OPTION=
ifeq (${CXX}, icpc)
@@ -154,7 +155,7 @@
else
- PIC_OPTION=-fPIC
+ PIC_OPTION=
PLATFORM_COMPILE_OPTIONS = -Wall
endif
@@ -184,6 +185,7 @@
PLATFORM_CXX_COMPILE_OPTIONS = +p -mt -Aa
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.sl
+ LIBSUFFIX=.a
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
$(PLATFORM_CXX_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
@@ -199,8 +201,8 @@
ifeq (${CXX}, g++)
- PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
+ PLATFORM_COMPILE_OPTIONS = -instances=static -D${PLATFORM} -D_REENTRANT
+ ALLLIBS = ${LIBS}
ifdef XALAN_USE_ICU
LD_RPATH_PRE= -Wl,-rpath,
@@ -209,10 +211,10 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
- LINK = g++ -D${PLATFORM} -fPIC
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared
+ LINK = g++ -D${PLATFORM}
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
+ ALLLIBS = ${LIBS}
PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
$(LD_RPATH_PRE)${ICUI18NROOT}/lib
@@ -231,6 +233,7 @@
endif
SHLIBSUFFIX=.so
+ LIBSUFFIX=.a
endif
@@ -241,8 +244,8 @@
ifeq (${CXX}, g++)
- PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
+ PLATFORM_COMPILE_OPTIONS = -instances=static -D${PLATFORM} -D_REENTRANT
+ ALLLIBS = ${LIBS}
ifdef XALAN_USE_ICU
LD_RPATH_PRE= -Wl,-rpath,
@@ -252,15 +255,15 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
- LINK = g++ -D${PLATFORM} -fPIC
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared
+ LINK = g++ -D${PLATFORM}
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
+ ALLLIBS = ${LIBS}
else
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
- ALLLIBS = ${LIBS} -L/usr/lib
+ ALLLIBS = ${LIBS}
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG -I${STLPORTROOT}/stlport
@@ -276,6 +279,7 @@
endif
SHLIBSUFFIX=.a
+ LIBSUFFIX=.a
endif
@@ -288,6 +292,7 @@
PLATFORM_COMPILE_OPTIONS2 =-Wc,dll
-W0,"langlvl(extended),notempinc,float(ieee),targ(osv2r8)" -D${PLATFORM}
-D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
ALLLIBS =
SHLIBSUFFIX=.dll
+ LIBSUFFIX=.a
OS390SIDEDECK=.x
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
@@ -309,8 +314,9 @@
SUPPORTED = TRUE
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${ALL_OBJECTS_DIR}/.cxx_repository
-ieee -pthread -std strict_ansi_errors
- ALLLIBS = ${LIBS} -L/usr/lib -lm
+ ALLLIBS = ${LIBS} -lm
SHLIBSUFFIX = .so
+ LIBSUFFIX=.a
CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS) -nocxxstd
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr
${ALL_OBJECTS_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors -nocxxstd
@@ -324,8 +330,9 @@
SUPPORTED = TRUE
PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT
-DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
+ ALLLIBS = ${LIBS}
SHLIBSUFFIX=.dylib
+ LIBSUFFIX=.a
CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = ${CC} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
@@ -435,13 +442,13 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $^ -o
$@
+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x
$(ALLLIBS)
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -451,13 +458,13 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS) $^ -o
$@
+ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x
$(ALLLIBS)
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -467,7 +474,7 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@
$(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
${ALL_OBJECTS_DIR}/TestXPath.o: $(TESTXPATH_DIR)/TestXPath.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o: $(TESTXPATH_DIR)/NodeNameTreeWalker.cpp
@@ -475,7 +482,7 @@
else
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME)
$(ALLLIBS)
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -493,12 +500,12 @@
$(MAKE_SHARED) $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ApacheModuleXSLT/%.c
- $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I/usr/include/apache/
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
$(MAKE_SHARED) $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ApacheModuleXSLT/%.c
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I/usr/include/apache/
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
CompileStylesheet: lib $(BINTARGETDIR)/CompileStylesheet
@@ -511,7 +518,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/CompileStylesheet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -526,7 +533,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/DocumentBuilder/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -541,7 +548,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ExternalFunction/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -556,7 +563,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ParsedSourceWrappers/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -571,7 +578,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SerializeNodeSet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -586,7 +593,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -601,7 +608,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathAPI/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -616,7 +623,7 @@
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -631,7 +638,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -646,7 +653,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -661,7 +668,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/UseStylesheetParam/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -676,7 +683,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -691,7 +698,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransformerCallback/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -706,7 +713,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XPathWrapper/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -723,7 +730,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
@@ -759,15 +766,15 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS) $(CXXFLAGS) $^
-o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX)
+lib: prepare compile $(THISLIB)$(LIBSUFFIX)
-$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS) $^ -o $@
+$(THISLIB)$(LIBSUFFIX): $(ALL_OBJECTS)
+ @l_ar@ $@ $^
ifeq ($(PLATFORM), OS390)
cp -p *.x ${LIB_DIR}
endif
@@ -779,6 +786,7 @@
rm -rf $(XALANCROOT)/src/so_locations
endif
rm -f $(THISLIB)$(VER)$(SHLIBSUFFIX)
+ rm -f $(THISLIB)$(LIBSUFFIX)
rm -f $(THISLIB)$(VER).map1
rm -f $(BINTARGETDIR)/testXSLT
rm -f $(BINTARGETDIR)/testXPath
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
