peiyongz 2004/03/25 10:40:49
Modified: c/obj Makefile.in
Log:
Patch to template instantiation issue in building libxerces-depdom on Solaris
Revision Changes Path
1.40 +12 -2 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.in 22 Mar 2004 22:07:26 -0000 1.39
+++ Makefile.in 25 Mar 2004 18:40:48 -0000 1.40
@@ -104,7 +104,11 @@
endif
ALL_OBJECTS=$(wildcard $(PLATFORM)/*.o)
+# obj/<platform>/depdom/*.o
DEPDOM_OBJECTS=$(wildcard $(PLATFORM)/depdom/*.o)
+DEPDOM_OBJS_REF=${DEPDOM_OBJECTS}
+# obj/<platform>/*.o
+DEPDOM_OBJS=$(subst depdom/,,${DEPDOM_OBJS_REF})
#######################################################
# HP-UX with CC compiler is awkward since it does #
@@ -192,8 +196,14 @@
## DepDOM ##
${FQ_REAL_DEPDOM}: $(DEPDOM_OBJECTS)
@echo Building ${FQ_REAL_DEPDOM}
+ifeq (${PLATFORM},SOLARIS)
+ cp $(DEPDOM_OBJECTS) $(PLATFORM)
+ ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${DEPDOM_OBJS}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB}
-l${LINK_LIBNAME}
+ rm ${DEPDOM_OBJS}
+else
${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
- ifneq (${FQ_SO_DEPDOM},${FQ_REAL_DEPDOM})
+endif
+ ifneq (${FQ_SO_DEPDOM},${FQ_REAL_DEPDOM})
@echo symlink ${FQ_SO_DEPDOM}
rm -rf ${FQ_SO_DEPDOM} && ln -s ${FQ_REAL_DEPDOM} ${FQ_SO_DEPDOM}
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
