dbertoni 2003/07/24 17:27:42
Modified: c/src/xalanc Makefile.in
Log:
Fixes library names and linking problems on AIX. Fixes Bugzilla 13238.
Revision Changes Path
1.13 +36 -26 xml-xalan/c/src/xalanc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 24 Jul 2003 12:10:06 -0000 1.12
+++ Makefile.in 25 Jul 2003 00:27:42 -0000 1.13
@@ -165,11 +165,17 @@
LIBMAJORVER = 16
LIBMINORVER = 0
VER = 1_6_0
+LIBKEYNAME= ${PROJECT_NAME}
ifeq ($(PLATFORM),OS390)
-LIB = ${LIBNAME}.${VER}$(OS390SIDEDECK)
-else
-LIB = ${LIBNAME}$(SHLIBSUFFIX).${LIBMAJORVER}.${LIBMINORVER}
-endif
+ LIB = ${LIBNAME}.${VER}$(OS390SIDEDECK)
+else
+ifeq ($(PLATFORM),AIX)
+ LIB = ${LIBNAME}${LIBMAJORVER}.${LIBMINORVER}${SHLIBSUFFIX}
+ LIBKEYNAME=${PROJECT_NAME}${LIBMAJORVER}
+else
+ LIB = ${LIBNAME}$(SHLIBSUFFIX).${LIBMAJORVER}.${LIBMINORVER}
+endif ## AIX
+endif ## OS390
THISLIB = ${LIB_DIR}/${LIB}
PRODUCTNAME = xalan
@@ -597,7 +603,7 @@
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) $(ALLLIBS) $^ -o
$@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS) $^ -o $@
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -613,7 +619,7 @@
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) $(ALLLIBS) $^ -o
$@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS) $^ -o $@
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -632,7 +638,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -656,7 +662,7 @@
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I/usr/include/apache/
$(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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(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 $@ $<
endif
@@ -671,7 +677,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/CompileStylesheet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -686,7 +692,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/DocumentBuilder/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -701,7 +707,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ExternalFunction/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -716,7 +722,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ParsedSourceWrappers/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -731,7 +737,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SerializeNodeSet/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -746,7 +752,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -761,7 +767,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathAPI/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -776,7 +782,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -791,7 +797,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -806,7 +812,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -821,7 +827,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TransformToXercesDOM/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -836,7 +842,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/UseStylesheetParam/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -851,7 +857,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransform/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -866,7 +872,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransformerCallback/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -881,7 +887,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XPathWrapper/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -898,7 +904,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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
@@ -934,7 +940,7 @@
$(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) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(LIBKEYNAME) $(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
@@ -957,8 +963,12 @@
cp -p *.x ${LIB_DIR}
else
$(LN) -s $(THISLIB) $(LIB_DIR)/$(LIBNAME)$(SHLIBSUFFIX)
+ifeq ($(PLATFORM), AIX)
+ $(LN) -s $(THISLIB) $(LIB_DIR)/$(LIBNAME)$(LIBMAJORVER)$(SHLIBSUFFIX)
+else
$(LN) -s $(THISLIB) $(LIB_DIR)/$(LIBNAME)$(SHLIBSUFFIX).$(LIBMAJORVER)
-endif
+endif ## AIX
+endif ## OS390
endif ## OS390BATCH
install: all
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
