|
|
@@ -1,36 +1,40 @@
|
|
|
---- obj/Makefile.in.dist Fri Dec 6 15:39:08 2002
|
|
|
-+++ obj/Makefile.in Fri Dec 6 15:39:18 2002
|
|
|
-@@ -68,6 +68,7 @@
|
|
|
- ###################################################################
|
|
|
+--- obj/Makefile.in.dist Sat Dec 7 10:19:48 2002
|
|
|
++++ obj/Makefile.in Sat Dec 7 10:21:05 2002
|
|
|
+@@ -82,6 +82,9 @@
|
|
|
+ include ../version.incl
|
|
|
+ include ../src/xercesc/Makefile.incl
|
|
|
|
|
|
- PLATFORM = @platform@
|
|
|
++#override AR definition in Makefile.incl
|
|
|
+AR = @l_ar@
|
|
|
- CC = @cc@
|
|
|
- CXX = @cxx@
|
|
|
- GCC = @GCC@
|
|
|
-@@ -117,7 +118,7 @@
|
|
|
++
|
|
|
+ LIB=${XERCESCROOT}/lib
|
|
|
+ ## OS390BATCH
|
|
|
+ ifeq (${OS390BATCH},1)
|
|
|
+@@ -117,7 +120,7 @@
|
|
|
\rm -f $(DUMMYEXE)
|
|
|
|
|
|
$(DUMMYEXE): $(ALL_OBJECTS)
|
|
|
- ${MAKE_SHARED} -o ${@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
|
|
|
-+ $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
|
|
|
++ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
|
|
|
|
|
|
###### End HP-UX CC compiler specific stuff #######
|
|
|
else
|
|
|
-@@ -147,11 +148,7 @@
|
|
|
+@@ -146,12 +149,8 @@
|
|
|
+ ########################################################
|
|
|
|
|
|
${FQ_REAL_NAME}: $(ALL_OBJECTS)
|
|
|
- @echo Building ${FQ_REAL_NAME}
|
|
|
+- @echo Building ${FQ_REAL_NAME}
|
|
|
- ${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
|
|
|
- @echo symlink ${FQ_SO_NAME}
|
|
|
- rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
|
|
|
- @echo symlink ${FQ_LINK_NAME}
|
|
|
- rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
|
|
|
-+ $(AR) ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
|
|
|
++ @echo Building ${FQ_LINK_NAME:.so=.a}
|
|
|
++ ${AR} ${FQ_LINK_NAME:.so=.a} ${^} $(TEMPLATESOBJS)
|
|
|
|
|
|
## Start OS390 ##
|
|
|
ifeq (${PLATFORM},OS390)
|
|
|
-@@ -200,7 +197,7 @@
|
|
|
+@@ -200,7 +199,7 @@
|
|
|
ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/${LIBNAME}.dll.a
|
|
|
ln -s ${PREFIX}/lib/${LIBNAME}${VER}.dll.a ${PREFIX}/lib/libxerces.dll.a
|
|
|
else
|