You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2007/08/21 11:22:26 UTC
svn commit: r568032 - in /xerces/c/branches/xerces-2.7: obj/ samples/
src/xercesc/ src/xercesc/dom/ src/xercesc/dom/deprecated/
src/xercesc/dom/impl/ src/xercesc/framework/ src/xercesc/framework/psvi/
src/xercesc/internal/ src/xercesc/parsers/ src/xerc...
Author: gareth
Date: Tue Aug 21 02:22:18 2007
New Revision: 568032
URL: http://svn.apache.org/viewvc?rev=568032&view=rev
Log:
add static build option. Thanks to Boris Kolpackov
Modified:
xerces/c/branches/xerces-2.7/obj/Makefile.in
xerces/c/branches/xerces-2.7/samples/Makefile.incl
xerces/c/branches/xerces-2.7/src/xercesc/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl
xerces/c/branches/xerces-2.7/src/xercesc/configure.in
xerces/c/branches/xerces-2.7/src/xercesc/dom/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/dom/deprecated/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/dom/impl/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/framework/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/internal/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/parsers/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/runConfigure
xerces/c/branches/xerces-2.7/src/xercesc/sax/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/sax2/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp
xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/Socket/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/libWWW/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/AIX/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/BeOS/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Cygwin/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/FreeBSD/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/HPUX/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/IRIX/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Interix/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Linux/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/MacOS/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/NetBSD/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS390/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS400/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OpenServer/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/PTX/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/QNX/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Solaris/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Tru64/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/UnixWare/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Cygwin/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/ICU/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv390/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv400/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvGNU/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Uniconv390/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/regx/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/DTD/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/common/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/datatype/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/identity/Makefile.in
xerces/c/branches/xerces-2.7/tests/Makefile.incl
Modified: xerces/c/branches/xerces-2.7/obj/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/obj/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/obj/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/obj/Makefile.in Tue Aug 21 02:22:18 2007
@@ -40,6 +40,7 @@
OSVER = @osver@
TRANSCODER = @transcoder@
MESSAGELOADER = @messageloader@
+LIBTYPE = @libtype@
BITSTOBUILD = @bitstobuild@
include ../version.incl
@@ -71,24 +72,25 @@
# instantiations in place. #
#######################################################
-ifeq (${PLATFORM},HPUX)
+ifeq (${LIBTYPE},shared)
+ ifeq (${PLATFORM},HPUX)
ifeq (${CXX},CC)
###### Start HP-UX CC compiler specific stuff #######
DUMMYEXE=$(XML_LIB_DIR)/dummyExe
TEMPLATESOBJS=$(wildcard $(TEMPLATESREPOSITORY)/*.o)
- all: $(DUMMYEXE) ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
+all: $(DUMMYEXE) ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
\rm -f $(DUMMYEXE)
- $(DUMMYEXE): $(ALL_OBJECTS)
+$(DUMMYEXE): $(ALL_OBJECTS)
${MAKE_SHARED} -o ${@} $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
###### End HP-UX CC compiler specific stuff #######
else
all: ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
endif
-else
+ else
## Start OS390BATCH ##
ifeq (${OS390BATCH},1)
all: ${BATCH_TARGET} ${DEPDOM_TARGET}
@@ -100,6 +102,9 @@
all: ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
endif
endif
+ endif
+else # static
+all: ${FQ_A_NAME} ${FQ_A_DEPDOM}
endif
########################################################
@@ -114,7 +119,9 @@
# link your application. #
########################################################
-ifeq (${PLATFORM},CYGWIN)
+ifeq (${LIBTYPE},shared)
+
+ ifeq (${PLATFORM},CYGWIN)
${FQ_SO_NAME}: $(ALL_OBJECTS)
@echo Building ${FQ_SO_NAME}
${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
@@ -123,7 +130,7 @@
@echo symlink ${FQ_LINK_NAME}.a
rm -rf ${FQ_LINK_NAME}.a && ln -s ${FQ_REAL_NAME}.a ${FQ_LINK_NAME}.a
-## DepDOM ##
+ ## DepDOM ##
${FQ_SO_DEPDOM}: $(DEPDOM_OBJECTS)
@echo Building ${FQ_SO_DEPDOM}
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
@@ -131,7 +138,7 @@
rm -rf ${FQ_REAL_DEPDOM}.a && ln -s ${XML_LIB_DIR}/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${FQ_REAL_DEPDOM}.a
@echo symlink ${FQ_LINK_DEPDOM}.a
rm -rf ${FQ_LINK_DEPDOM}.a && ln -s ${FQ_REAL_DEPDOM}.a ${FQ_LINK_DEPDOM}.a
-endif
+ endif
${FQ_REAL_NAME}: $(ALL_OBJECTS)
@echo Building ${FQ_REAL_NAME}
@@ -146,21 +153,21 @@
@echo symlink ${FQ_LINK_NAME}
rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
-## DepDOM ##
+ ## DepDOM ##
${FQ_REAL_DEPDOM}: $(DEPDOM_OBJECTS)
@echo Building ${FQ_REAL_DEPDOM}
-ifeq (${PLATFORM},SOLARIS)
+ ifeq (${PLATFORM},SOLARIS)
cp $(DEPDOM_OBJECTS) $(PLATFORM)
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${DEPDOM_OBJS} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
rm ${DEPDOM_OBJS}
-else
-ifeq (${PLATFORM},OS390)
+ else
+ ifeq (${PLATFORM},OS390)
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) ${LIB}/${LIBNAME}${VER}${OS390SIDEDECK}
$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${LIB}
-else
+ else
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
-endif
-endif
+ endif
+ 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}
@@ -168,32 +175,50 @@
@echo symlink ${FQ_LINK_DEPDOM}
rm -rf ${FQ_LINK_DEPDOM} && ln -s ${FQ_SO_DEPDOM} ${FQ_LINK_DEPDOM}
-## Start OS390 ##
-ifeq (${PLATFORM},OS390)
-## Start OS390BATCH ##
-ifeq (${OS390BATCH},1)
+ ## Start OS390 ##
+ ifeq (${PLATFORM},OS390)
+ ## Start OS390BATCH ##
+ ifeq (${OS390BATCH},1)
${BATCH_TARGET}: $(ALL_OBJECTS)
@echo Building ${BATCH_TARGET}
${MAKE_SHARED} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
${DEPDOM_TARGET}: $(DEPDOM_OBJECTS)
@echo Building ${DEPDOM_TARGET}
${MAKE_SHARED} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) $(BATCH_EXP)
-endif
+ endif
+ endif
+ ## End OS390 and OS390BATCH
+
+else # static
+${FQ_A_NAME}: $(ALL_OBJECTS)
+ @echo Building ${FQ_A_NAME}
+ ${AR} $(ARFLAGS) ${@} ${^}
+ ifneq ($(RANLIB),)
+ $(RANLIB) ${@}
+ endif
+
+${FQ_A_DEPDOM}: $(DEPDOM_OBJECTS)
+ @echo Building ${FQ_A_DEPDOM}
+ ${AR} $(ARFLAGS) ${@} ${^}
+ ifneq ($(RANLIB),)
+ $(RANLIB) ${@}
+ endif
endif
-## End OS390 and OS390BATCH
clean:
@echo "Making clean in obj ..."
- -rm -f $(ALL_OBJECTS) ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
+ -rm -f $(ALL_OBJECTS) $(DEPDOM_OBJECTS)
ifneq ($(strip $(TEMPLATESREPOSITORY)),)
-rm -f $(TEMPLATESREPOSITORY)/*.o
-rm -f $(TEMPLATESREPOSITORY)/*.c
-rm -f $(TEMPLATESREPOSITORY)/*.cs
-rm -f $(TEMPLATESREPOSITORY)/*.he
endif
-ifeq (${PLATFORM}, CYGWIN)
+ifeq (${LIBTYPE},shared)
+ -rm -f ${FQ_REAL_NAME} ${FQ_REAL_DEPDOM}
+ ifeq (${PLATFORM}, CYGWIN)
-rm -f ${XML_LIB_DIR}/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
-rm -f ${FQ_LINK_NAME}.a
-rm -f ${FQ_REAL_NAME}.a
@@ -201,12 +226,15 @@
-rm -f ${XML_LIB_DIR}/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
-rm -f ${FQ_LINK_DEPDOM}.a
-rm -f ${FQ_REAL_DEPDOM}.a
-else
+ else
-rm -f ${FQ_SO_NAME}
-rm -f ${FQ_LINK_NAME}
-rm -f ${FQ_SO_DEPDOM}
-rm -f ${FQ_LINK_DEPDOM}
+ endif
+else # static
+ -rm -f ${FQ_A_NAME} ${FQ_A_DEPDOM}
endif
-rm -f *.map
@@ -224,7 +252,8 @@
@echo "Nothing to do for OS390BATCH ..."
else
-mkdir -p ${DESTDIR}${PREFIX}/lib
-ifeq (${PLATFORM}, CYGWIN)
+ifeq (${LIBTYPE},shared)
+ ifeq (${PLATFORM}, CYGWIN)
-mkdir -p ${DESTDIR}${PREFIX}/bin
$(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
@@ -233,16 +262,20 @@
$(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
-else
+ else
$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
-endif
-ifeq (${PLATFORM},OS390)
+ endif
+ ifeq (${PLATFORM},OS390)
$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
+ endif
+else # shared
+ $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/lib
+ $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/lib
endif
endif
Modified: xerces/c/branches/xerces-2.7/samples/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/samples/Makefile.incl?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/samples/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/samples/Makefile.incl Tue Aug 21 02:22:18 2007
@@ -373,6 +373,6 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT
LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -framework CoreServices
SHLIBSUFFIX=.dylib
endif
Modified: xerces/c/branches/xerces-2.7/src/xercesc/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/Makefile.in Tue Aug 21 02:22:18 2007
@@ -36,6 +36,7 @@
PREFIX = @prefix@
MESSAGELOADER=@messageloader@
TRANSCODER=@transcoder@
+LIBTYPE = @libtype@
GCC = @GCC@
GXX = @GXX@
@@ -68,10 +69,14 @@
compile:: Prepare Util Sax Internal Framework Parsers Sax2 Dom Validators
-ifeq (${PLATFORM},CYGWIN)
+ifeq (${LIBTYPE},shared)
+ ifeq (${PLATFORM},CYGWIN)
lib:: ${FQ_SO_NAME}
-else
+ else
lib:: ${FQ_REAL_NAME}
+ endif
+else # static
+lib:: ${FQ_A_NAME}
endif
Prepare::
@@ -121,13 +126,19 @@
@echo Building "validators"
$Q${MAKE} -s -C $(VALIDATORS_DIR) $(MAKE_FLAGS)
-ifeq (${PLATFORM},CYGWIN)
+ifeq (${LIBTYPE},shared)
+ ifeq (${PLATFORM},CYGWIN)
${FQ_SO_NAME}:: compile
@echo Building ${FQ_SO_NAME}
- $Q${MAKE} -s -C $(XML_OBJ) -k $(MAKE_FLAGS)
-else
+ $Q${MAKE} -C $(XML_OBJ) -k $(MAKE_FLAGS)
+ else
${FQ_REAL_NAME}:: compile
@echo toplevel Building ${FQ_REAL_NAME}
+ $Q${MAKE} -C $(XML_OBJ) -k $(MAKE_FLAGS)
+ endif
+else # static
+${FQ_A_NAME}:: compile
+ @echo Building ${FQ_A_NAME}
$Q${MAKE} -C $(XML_OBJ) -k $(MAKE_FLAGS)
endif
Modified: xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl Tue Aug 21 02:22:18 2007
@@ -70,15 +70,30 @@
## Compiler switch to embed a library name
## default value empty
LD_SONAME =
+LD_SODEPDOM =
+
+# Default AR and RANLIB setting if we are building static libraries.
+#
+ifeq (${LIBTYPE},static)
+ AR = ar
+ ARFLAGS = -rc
+ RANLIB = ranlib
+ STLIBSUFFIX = .a
+endif
####################### PLATFORM DEPENDENCIES #####################
#=============== SOLARIS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, SOLARIS)
ifeq (${GXX}, yes)
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-licuuc -licudata -lm -lgen
@@ -97,10 +112,15 @@
LD_SODEPDOM = -Wl,-h,${SO_DEPDOM}
else
- PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XML_OBJ_DIR) \
+ PLATFORM_COMPILE_OPTIONS = -mt -xs -ptr$(XML_OBJ_DIR) \
-features=rtti -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -KPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XML_OBJ_DIR) ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = -mt ${LIBS} -licuuc -licudata
else
@@ -123,9 +143,14 @@
#=============== UNIXWARE SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, UNIXWARE)
ifeq (${GXX}, yes)
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-licuuc -licudata -lm -lw -lgen
@@ -140,10 +165,14 @@
endif
else
- PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs \
- -D${PLATFORM} -D_REENTRANT
+ PLATFORM_COMPILE_OPTIONS = -mt -xs -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -KPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -G ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/local/lib -L/usr/ccs/lib \
-licuuc -licudata -lm -lw -lC -lc -lgen
@@ -165,21 +194,29 @@
#=============== OPENSERVER SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, OPENSERVER)
ifeq (${GXX}, yes)
- COMMON_COMPILE_OPTIONS = -D${PLATFORM} -fPIC
+ COMMON_COMPILE_OPTIONS = -D${PLATFORM}
ifeq (${THREADS}, none)
PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS}
else
PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS} -D_REENTRANT
endif
+
+ ifeq (${LIBTYPE},shared)
+ COMMON_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -G ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
EXTRA_LINK_OPTIONS = -Wl,-h,${LIBNAME}${VER}${SHLIBSUFFIX}
DEPDOM_LINK_OPTIONS = -Wl,-h,${LIBDEPDOM}${VER}${SHLIBSUFFIX}
+ endif
else
- PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -belf -KPIC
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -belf
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -KPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -belf -G ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -belf -G ${LDFLAGS}
endif
+ endif
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -licuuc -licudata
else
@@ -195,17 +232,20 @@
PLATFORM_CPP_COMPILER = c++
PLATFORM_C_COMPILER = cc
ifeq (${TRANSCODER}, ICU)
- PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
+ PLATFORM_COMPILE_OPTIONS = -Kthread -D${PLATFORM}
ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen -licuuc
else
- PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
+ PLATFORM_COMPILE_OPTIONS = -Kthread -D${PLATFORM}
ALLLIBS = ${LIBS} -lm -lgen
endif
OBJ_OUT=${ALL_OBJECTS_DIR}/
-MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
-MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
-EXTRA_LINK_OPTIONS = -lm -lgen
-DEPDOM_LINK_OPTIONS = -lm -lgen
+ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -KPIC
+ MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
+ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
+ EXTRA_LINK_OPTIONS = -lm -lgen
+ DEPDOM_LINK_OPTIONS = -lm -lgen
+endif
SHLIBSUFFIX=.so
ICUSHLIBSUFFIX=.so
endif
@@ -213,9 +253,13 @@
#================= AIX SPECIFIC OPTIONS ===========================
ifeq (${PLATFORM}, AIX)
ifeq (${GXX}, yes)
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ endif
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib \
@@ -245,6 +289,7 @@
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE -qnamemangling=ansi
endif
+ ifeq (${LIBTYPE},shared)
ifeq (${BITSTOBUILD}, 64)
MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS} -X64
MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS} -X64
@@ -256,6 +301,7 @@
EXTRA_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map
DEPDOM_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBDEPDOM}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map
endif
+ endif
SHLIBSUFFIX=.a
ICUSHLIBSUFFIX=.a
@@ -266,72 +312,94 @@
#================= OS400 SPECIFIC OPTIONS ==========================
ifeq (${PLATFORM}, OS400)
-ifeq (${SYSOVR},OS400)
-MYCC = /afs/rchland.ibm.com/usr2/phkramer/bin/tvcc.pl
-else
-MYCC = icc
-endif
-CXX = $(MYCC)
-CC = $(MYCC)
-JUSTCC = $(MYCC)
-XML_INCL += -I${ICUROOT}/include
-ifeq (${SYSOVR},OS400)
-PLATFORM_COMPILE_OPTIONS = -qnotempinc
-MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS}
-MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS}
-TO = qwobj
-SHLIBSUFFIX=.a
-ICUSHLIBSUFFIX=.a
-else
-PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_MULTI_THREADED -D${PLATFORM}
-PLATFORM_C_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM}
-MAKE_SHARED = ld -v ${LDFLAGS}
-MAKE_SHARED_C = ld -v ${LDFLAGS}
-SHLIBSUFFIX=.o
-ICUSHLIBSUFFIX=.o
-endif
-ifeq (${TRANSCODER}, ICU)
-ifeq (${SYSOVR},OS400)
-EXTRA_LINK_OPTIONS = -licuuc -licudata -lbsd
-DEPDOM_LINK_OPTIONS = -licuuc -licudata -lbsd
-else
-EXTRA_LINK_OPTIONS = -lQZUUC
-DEPDOM_LINK_OPTIONS = -lQZUUC
-endif
-endif
-EXTRA_COMPILE_OPTIONS = -I. -g
-EXTRA_LINK_OPTIONS = -q OPTION='*DUPVAR *DUPPROC'
-DEPDOM_LINK_OPTIONS = -q OPTION='*DUPVAR *DUPPROC'
+ ifeq (${SYSOVR},OS400)
+ MYCC = /afs/rchland.ibm.com/usr2/phkramer/bin/tvcc.pl
+ else
+ MYCC = icc
+ endif
+
+ CXX = $(MYCC)
+ CC = $(MYCC)
+ JUSTCC = $(MYCC)
+ XML_INCL += -I${ICUROOT}/include
+
+ ifeq (${SYSOVR},OS400)
+ PLATFORM_COMPILE_OPTIONS = -qnotempinc
+
+ ifeq (${LIBTYPE},shared)
+ MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS}
+ MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS}
+ endif
+
+ TO = qwobj
+ SHLIBSUFFIX=.a
+ ICUSHLIBSUFFIX=.a
+ else
+ PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_MULTI_THREADED -D${PLATFORM}
+ PLATFORM_C_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM}
+
+ ifeq (${LIBTYPE},shared)
+ MAKE_SHARED = ld -v ${LDFLAGS}
+ MAKE_SHARED_C = ld -v ${LDFLAGS}
+ endif
+
+ SHLIBSUFFIX=.o
+ ICUSHLIBSUFFIX=.o
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
+ ifeq (${SYSOVR},OS400)
+ EXTRA_LINK_OPTIONS = -licuuc -licudata -lbsd
+ DEPDOM_LINK_OPTIONS = -licuuc -licudata -lbsd
+ else
+ EXTRA_LINK_OPTIONS = -lQZUUC
+ DEPDOM_LINK_OPTIONS = -lQZUUC
+ endif
+ endif
-RM2 = -del
-MV = mv
+ EXTRA_COMPILE_OPTIONS = -I. -g
+ EXTRA_LINK_OPTIONS = -q OPTION='*DUPVAR *DUPPROC'
+ DEPDOM_LINK_OPTIONS = -q OPTION='*DUPVAR *DUPPROC'
+ RM2 = -del
+ MV = mv
endif
#=============== BEOS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, BEOS)
-PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -DAPP_NO_THREADS
-MAKE_SHARED = ${CXX} -D${PLATFORM} -nostart -fPIC ${LDFLAGS}
-MAKE_SHARED_C = ${CC} -D${PLATFORM} -nostart -fPIC ${LDFLAGS}
-ifeq (${TRANSCODER}, ICU)
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -DAPP_NO_THREADS
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -nostart -fPIC ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -nostart -fPIC ${LDFLAGS}
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -licuuc -licudata
-else
+ else
ALLLIBS = ${LIBS} -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe
-endif
-EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
-DEPDOM_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_DEPDOM}.map
-SHLIBSUFFIX=.so
-ICUSHLIBSUFFIX=.so
-## Compiler switch to embed a library name
-LD_SONAME = -Wl,-soname,${SO_NAME}
-LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
+ endif
+
+ EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
+ DEPDOM_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_DEPDOM}.map
+ SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
+
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname,${SO_NAME}
+ LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
endif
#=============== INTERIX SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, INTERIX)
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT -D_ALL_SOURCE
+
+ ifeq (${LIBTYPE},shared)
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+ endif
+
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.so
endif
@@ -339,8 +407,14 @@
#=============== MINGW SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MINGW)
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -fexceptions -D__GNUWIN32__ -DWIN32 -D_WINDOWS -DNDEBUG -DPLATFORM_WIN32
- MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
+
+ ifeq (${LIBTYPE},shared)
+ MAKE_SHARED = dllwrap --export-all-symbols --driver-name ${CXX} ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} ${LDFLAGS}
+ else
+ PLATFORM_COMPILE_OPTIONS += -DXML_LIBRARY # switch off import/export
+ endif
+
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.dll
endif
@@ -350,9 +424,13 @@
ifneq ($(filter xlC%,${CXX}),)
- PLATFORM_COMPILE_OPTIONS = -qpic -qnotempinc -D${PLATFORM}
+ PLATFORM_COMPILE_OPTIONS = -qnotempinc -D${PLATFORM}
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -qpic
MAKE_SHARED = ${CXX} -D${PLATFORM} -qpic -qmkshrobj -G ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -qpic -qmkshrobj -G ${LDFLAGS}
+ endif
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -licuuc -licudata
@@ -369,9 +447,13 @@
else
#non xlC_r
#
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ endif
ifeq (${BITSTOBUILD}, 64)
ifeq (${TRANSCODER}, ICU)
@@ -410,96 +492,115 @@
#=============== QNX SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, QNX)
-PLATFORM_COMPILE_OPTIONS = -shared
-MAKE_SHARED = ${CXX} -shared ${LDFLAGS}
-MAKE_SHARED_C = ${CC} -shared ${LDFLAGS}
-ifeq (${TRANSCODER}, ICU)
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS = -shared
+ MAKE_SHARED = ${CXX} -shared ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -shared ${LDFLAGS}
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -licudata
-else
+ else
ALLLIBS = ${LIBS}
-endif
+ endif
-ifeq (${MESSAGELOADER}, ICU)
+ ifeq (${MESSAGELOADER}, ICU)
ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -licudata -lXercesMessages
-endif
+ endif
-EXTRA_LINK_OPTIONS =
-DEPDOM_LINK_OPTIONS =
-SHLIBSUFFIX=.so
-ICUSHLIBSUFFIX=.so
-## Compiler switch to embed a library name
-LD_SONAME = -Wl,-soname,${SO_NAME}
-LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
+ EXTRA_LINK_OPTIONS =
+ DEPDOM_LINK_OPTIONS =
+ SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname,${SO_NAME}
+ LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
endif
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
-MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-ifeq (${TRANSCODER}, ICU)
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM}
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
+ PLATFORM_COMPILE_OPTIONS += -I/usr/local/include
ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
-else
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
+ else
ALLLIBS = ${LIBS}
-endif
-SHLIBSUFFIX=.so
-ICUSHLIBSUFFIX=.so
-## Compiler switch to embed a library name
-LD_SONAME = -Wl,-soname,${SO_NAME}
-LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
+ endif
+
+ SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname,${SO_NAME}
+ LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
endif
#=============== NETBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, NETBSD)
-MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
-ifeq (${TRANSCODER}, ICU)
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM}
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
+ PLATFORM_COMPILE_OPTIONS += -I/usr/local/include
ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
-else
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
+ else
ALLLIBS = ${LIBS}
-endif
-SHLIBSUFFIX=.so
-ICUSHLIBSUFFIX=.so
-## Compiler switch to embed a library name
-LD_SONAME = -Wl,-soname,${SO_NAME}
-LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
+ endif
+
+ SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname,${SO_NAME}
+ LD_SODEPDOM = -Wl,-soname,${SO_DEPDOM}
endif
#=============== IRIX SPECIFIC OPTIONS ============================
ifeq (${PLATFORM}, IRIX)
-PLATFORM_COMPILE_OPTIONS = -LANG:pch -LANG:std -O2 \
+ PLATFORM_COMPILE_OPTIONS = -LANG:pch -LANG:std -O2 \
-D${PLATFORM} -D_REENTRANT -no_auto_include \
-I/usr/local/include
-MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
-MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
-ifeq (${TRANSCODER}, ICU)
+
+ ifeq (${LIBTYPE},shared)
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+ endif
+
+ ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -lC -licuuc -licudata
-else
+ else
ALLLIBS = ${LIBS} -lC
-endif
-SHLIBSUFFIX=.so
-ICUSHLIBSUFFIX=.so
+ endif
+
+ SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
endif
#=============== OS2 SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, OS/2)
-#PLATFORM_CPP_COMPILER = icc
-#PLATFORM_C_COMPILER = icc
-PLATFORM_LIBRARIES= CPPOM30.LIB os2386.lib mmpm2.lib
-PLATFORM_COMPILE_OPTIONS = /C+ /Gd- /Ge- /Gm+ /Gs- /Re /J+ /Ms /Sm /Sn /Ss+
-MAKE_SHARED = ilink /nofree ${LDFLAGS}
-MAKE_SHARED_C = ilink /nofree ${LDFLAGS}
-EXTRA_LINK_OPTIONS = /map /nod /noe /noi /packcode /packdata /exepack /align:4
-DEPDOM_LINK_OPTIONS = /map /nod /noe /noi /packcode /packdata /exepack /align:4
-SHLIBSUFFIX= .dll
-ICUSHLIBSUFFIX= .dll
-ifneq (${DEBUG}, 1)
-XML_BUILD_OPTIONS += -2
-endif
+ PLATFORM_LIBRARIES= CPPOM30.LIB os2386.lib mmpm2.lib
+ PLATFORM_COMPILE_OPTIONS = /C+ /Gd- /Ge- /Gm+ /Gs- /Re /J+ /Ms /Sm /Sn /Ss+
+ MAKE_SHARED = ilink /nofree ${LDFLAGS}
+ MAKE_SHARED_C = ilink /nofree ${LDFLAGS}
+ EXTRA_LINK_OPTIONS = /map /nod /noe /noi /packcode /packdata /exepack /align:4
+ DEPDOM_LINK_OPTIONS = /map /nod /noe /noi /packcode /packdata /exepack /align:4
+ SHLIBSUFFIX= .dll
+ ICUSHLIBSUFFIX= .dll
+ ifneq (${DEBUG}, 1)
+ XML_BUILD_OPTIONS += -2
+ endif
endif
#================= HP SPECIFIC OPTIONS ===========================
@@ -512,9 +613,14 @@
endif
ifeq (${GXX}, yes)
+
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -fPIC -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -fPIC -shared ${LDFLAGS}
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ endif
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib \
@@ -530,13 +636,17 @@
else
ifeq (${CXX}, aCC)
ifeq (${CXXVER}, aCC05)
- PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} -mt +Z
+ PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} -mt
else
- PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} +DAportable +Z
+ PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC -D${OSVERDEFINE} +DAportable
endif
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += +Z
MAKE_SHARED = ${CXX} ${PLATFORM_COMPILE_OPTIONS} -D${PLATFORM} ${LDFLAGS}
MAKE_SHARED_C = ${CC} ${PLATFORM_COMPILE_OPTIONS} -D${PLATFORM} ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -licuuc -licudata
else
@@ -558,14 +668,19 @@
else
TEMPLATESREPOSITORY = ${XML_OBJ_DIR}/ptrepository
COMMON_COMPILE_OPTIONS = -D_HP_UX -DXERCES_TMPLSINC \
- -D${OSVERDEFINE} +DAportable +eh +Z -Z +a1 +d
+ -D${OSVERDEFINE} +DAportable +eh -Z +a1 +d
ifeq ($(MODULE), dom)
PLATFORM_COMPILE_OPTIONS = -DDOM_PROJ $(COMMON_COMPILE_OPTIONS)
else
PLATFORM_COMPILE_OPTIONS = $(COMMON_COMPILE_OPTIONS) -ptr${TEMPLATESREPOSITORY}
endif
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += +Z
MAKE_SHARED = $(CXX) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL) ${LDFLAGS}
MAKE_SHARED_C = $(CC) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL) ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -licuuc -licudata
else
@@ -632,10 +747,16 @@
ifeq (${PLATFORM}, TRU64)
SHLIBSUFFIX=.so
ICUSHLIBSUFFIX=.so
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+
ifeq (${GXX}, yes)
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
+ PLATFORM_COMPILE_OPTIONS += -fPIC
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
- PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -licuuc -licudata -lc -lrt
else
@@ -647,8 +768,13 @@
endif
else
- MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository ${LDFLAGS}
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
+
+ ifeq (${LIBTYPE},shared)
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc -lrt
else
@@ -671,8 +797,12 @@
PLATFORM_COMPILE_OPTIONS = \
-D${PLATFORM} \
-D_REENTRANT
+
+ ifeq (${LIBTYPE},shared)
MAKE_SHARED = ${CXX} -D${PLATFORM} -dynamiclib ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -dynamiclib ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc
else
@@ -696,8 +826,12 @@
-D__${PLATFORM}__ \
-I/usr/include \
-I/usr/include/w32api
+
+ ifeq (${LIBTYPE},shared)
MAKE_SHARED = ${CXX} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -shared ${LDFLAGS}
+ endif
+
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc
else
@@ -749,6 +883,22 @@
LIBDEPDOM=libxercesdepdom
endif
+###################### A_NAME ####################################
+#
+#
+ifeq (${LIBTYPE},static)
+
+A_NAME = ${LIBNAME}${STLIBSUFFIX}
+A_DEPDOM = ${LIBDEPDOM}${STLIBSUFFIX}
+
+FQ_A_NAME = ${XML_LIB_DIR}/${A_NAME}
+FQ_A_DEPDOM = ${XML_LIB_DIR}/$(A_DEPDOM)
+
+RESLIB_REAL_NAME = ${RESLIBNAME}${STLIBSUFFIX}
+FQ_RESLIB_REAL_NAME=${XML_LIB_DIR}/${RESLIB_REAL_NAME}
+
+else # dynamic
+
###################### SO_NAME ####################################
#
#
@@ -885,6 +1035,8 @@
FQ_RESLIB_SO_NAME =${XML_LIB_DIR}/${RESLIB_SO_NAME}
FQ_RESLIB_REAL_NAME=${XML_LIB_DIR}/${RESLIB_REAL_NAME}
+endif # dynamic
+
###################### STANDARD TOOLS #############################
ifeq (${PLATFORM}, OS400)
CP = -cp -fph
@@ -896,7 +1048,6 @@
endif
RM = -rm -f
CAT = cat
-AR = ar -cqv
CD = cd
CC1 = ${CXX} ${PLATFORM_COMPILE_OPTIONS}
JUST_CC = ${CC} -D${PLATFORM}
Modified: xerces/c/branches/xerces-2.7/src/xercesc/configure.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/configure.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/configure.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/configure.in Tue Aug 21 02:22:18 2007
@@ -111,6 +111,9 @@
threads=${THREADS}
AC_SUBST(threads)
+libtype=${LIBTYPE}
+AC_SUBST(libtype)
+
bitstobuild=${BITSTOBUILD}
AC_SUBST(bitstobuild)
Modified: xerces/c/branches/xerces-2.7/src/xercesc/dom/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/dom/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/dom/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/dom/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = dom
Modified: xerces/c/branches/xerces-2.7/src/xercesc/dom/deprecated/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/dom/deprecated/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/dom/deprecated/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/dom/deprecated/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = dom
SUBMODULE = deprecated
Modified: xerces/c/branches/xerces-2.7/src/xercesc/dom/impl/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/dom/impl/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/dom/impl/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/dom/impl/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = dom
SUBMODULE = impl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/framework/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/framework/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/framework/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/framework/Makefile.in Tue Aug 21 02:22:18 2007
@@ -132,6 +132,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/Makefile.in Tue Aug 21 02:22:18 2007
@@ -49,6 +49,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/internal/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/internal/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/internal/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/internal/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/parsers/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/parsers/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/parsers/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/parsers/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/runConfigure
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/runConfigure?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/runConfigure (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/runConfigure Tue Aug 21 02:22:18 2007
@@ -67,7 +67,8 @@
echo " -r <thread option> can be 'pthread' or 'dce'
(AIX, HP-11, and Solaris) or 'sproc' (IRIX) or 'none'
[default: pthread]"
- echo " -b <bitsToBuild> (accepts '64', '32')" [default: 32]
+ echo " -s (specifies that you want to build static libraries) [default: shared]"
+ echo " -b <bitsToBuild> (accepts '64', '32') [default: 32]"
echo " -l <extra linker options>"
echo " -z <extra compiler options>"
echo " -P <install-prefix>"
@@ -105,23 +106,24 @@
debug=off # by default debug is off
transcoder=native # by default use native transcoder
msgloader=inmem # by default use inmem message loader
-netaccessor=socket # by default use socket (can do HTTP URL's)
+netaccessor= # the default is platform-dependant
thread=pthread # by default use POSIX threads
configureoptions=""
bitsToBuild=32 # by default 32 bit build assumed
+libtype=shared # by default build shared libraries
# Check the command line parameters
if test -x /usr/bin/getopt -o -x bin/getopt; then
#
# os400 Users will need to comment out the next line.
- getoptErr=`getopt p:c:x:dm:n:t:r:b:l:z:P:C:h $*`
+ getoptErr=`getopt p:c:x:dm:n:t:r:sb:l:z:P:C:h $*`
if [ $? != 0 ]
then
usage
exit ${ERROR_EXIT_CODE}
fi
# Now get the command line parameters
- set -- `getopt p:c:x:dm:n:t:r:b:l:z:P:C:h $*`
+ set -- `getopt p:c:x:dm:n:t:r:sb:l:z:P:C:h $*`
while [ $# -gt 0 ]
do
case $1 in
@@ -149,6 +151,9 @@
-r)
thread=$2; shift 2;;
+ -s)
+ libtype=static; shift;;
+
-b)
bitsToBuild=$2; shift 2;;
@@ -179,7 +184,7 @@
done
else
- while getopts "p:c:x:dm:n:t:r:b:l:z:P:C:h" switch; do
+ while getopts "p:c:x:dm:n:t:r:sb:l:z:P:C:h" switch; do
case $switch in
p)
platform=$OPTARG;;
@@ -205,6 +210,9 @@
r)
thread=$OPTARG;;
+ s)
+ libtype=static;;
+
b)
bitsToBuild=$OPTARG;;
@@ -232,6 +240,17 @@
done
fi
+if test -z "$netaccessor"; then
+
+ # by default use socket (can do HTTP URL's)
+ #
+ if test "$platform" = "mingw-msys"; then
+ netaccessor=winsock
+ else
+ netaccessor=socket
+ fi
+fi
+
echo "Generating makefiles with the following options ..."
echo "Platform: $platform"
echo "C Compiler: $ccompiler"
@@ -240,6 +259,7 @@
echo "Net Accessor: $netaccessor"
echo "Transcoder: $transcoder"
echo "Thread option: $thread"
+echo "Library type: $libtype"
echo "bitsToBuild option: $bitsToBuild"
echo "Extra compile options: $compileroptions"
echo "Extra link options: $linkeroptions"
@@ -739,6 +759,8 @@
LIBS="$transcodingLibs $msgloaderLibs $threadingLibs $netaccessorLibs"
export LIBS
+LIBTYPE=$libtype
+export LIBTYPE
echo
rm -f config.cache
@@ -764,6 +786,7 @@
echo export MESSAGELOADER=\"$MESSAGELOADER\"
echo export NETACCESSOR=\"$NETACCESSOR\"
echo export THREADS=\"$THREADS\"
+echo export LIBTYPE=\"$LIBTYPE\"
echo export BITSTOBUILD=\"$BITSTOBUILD\"
echo export CC=\"$CC\"
echo export CXX=\"$CXX\"
Modified: xerces/c/branches/xerces-2.7/src/xercesc/sax/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/sax/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/sax/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/sax/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/sax2/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/sax2/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/sax2/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/sax2/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp Tue Aug 21 02:22:18 2007
@@ -33,7 +33,7 @@
// These defines provide the platform specific keywords that they need
// to do this.
// ---------------------------------------------------------------------------
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) && !defined (XML_LIBRARY)
#define PLATFORM_EXPORT __declspec(dllexport)
#define PLATFORM_IMPORT __declspec(dllimport)
#else
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/Makefile.in Tue Aug 21 02:22:18 2007
@@ -35,6 +35,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Compilers
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in Tue Aug 21 02:22:18 2007
@@ -385,6 +385,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/Makefile.in Tue Aug 21 02:22:18 2007
@@ -78,6 +78,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = MsgLoaders/ICU
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in Tue Aug 21 02:22:18 2007
@@ -42,6 +42,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../../../../../version.incl
include ../../../../Makefile.incl
@@ -77,7 +78,11 @@
TARGET=
CLEANFILES += *.mak *.[co] *.lst *.a *.$(SO) $(RESFILES) *.ao README*resources.txt
-RESMODE=dll
+ifeq ($(LIBTYPE),shared)
+ RESMODE=dll
+else
+ RESMODE=static
+endif
# Resource shortname
RESNAME=XercesMessages
@@ -94,8 +99,14 @@
# target file for resource bundle - this must be set, or 'make all' won't
# build any resources.
RESLIBNAME=lib$(RESNAME)
-RESTARGET=lib$(RESNAME)$(ICUSHLIBSUFFIX)
-PKGTARGET=lib$(PKGNAME)$(ICUSHLIBSUFFIX)
+
+ifeq ($(LIBTYPE),shared)
+ RESTARGET=lib$(RESNAME)$(ICUSHLIBSUFFIX)
+ PKGTARGET=lib$(PKGNAME)$(ICUSHLIBSUFFIX)
+else
+ RESTARGET=lib$(RESNAME)$(STLIBSUFFIX)
+ PKGTARGET=lib$(PKGNAME)$(STLIBSUFFIX)
+endif
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
@@ -117,10 +128,12 @@
$(PKGDATA) --name $(PKGNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST)
mv $(PKGTARGET) $(RESTARGET)
mv $(RESTARGET) ${FQ_RESLIB_REAL_NAME}
+ifeq (${LIBTYPE},shared)
@echo symlink ${FQ_RESLIB_SO_NAME}
ln -fs ${FQ_RESLIB_REAL_NAME} ${FQ_RESLIB_SO_NAME}
@echo symlink ${FQ_RESLIB_LINK_NAME}
ln -fs ${FQ_RESLIB_SO_NAME} ${FQ_RESLIB_LINK_NAME}
+endif
res-install: $(RESTARGET)
$(PKGDATA) --name $(PKGNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST) --install $(shell icu-config --libdir)
@@ -128,7 +141,7 @@
# clean out files
distclean clean: $(CLEAN_SUBDIR)
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- -rm $(OBJECTS) $(TARGET) $(RESTARGET) $(RESFILES)
+ -rm -f $(OBJECTS) $(TARGET) $(RESTARGET) $(RESFILES)
# Make check: simply runs the sample, logged to a file
check: $(TARGET)
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/InMemory/Makefile.in Tue Aug 21 02:22:18 2007
@@ -81,6 +81,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = MsgLoaders/InMemory
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in Tue Aug 21 02:22:18 2007
@@ -78,6 +78,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = MsgLoaders/MsgCatalog
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/MsgLoaders/MsgFile/Makefile.in Tue Aug 21 02:22:18 2007
@@ -21,6 +21,7 @@
GXX = @GXX@
PREFIX = @prefix@
THREADS = @threads@
+LIBTYPE = @libtype@
PREFIX_INCLUDE = @prefix_include@
include ../../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccess/Makefile.in Tue Aug 21 02:22:18 2007
@@ -51,6 +51,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = NetAccessors/MacOSURLAccess
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/MacOSURLAccessCF/Makefile.in Tue Aug 21 02:22:18 2007
@@ -50,6 +50,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = NetAccessors/MacOSURLAccessCF
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/Socket/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/Socket/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/Socket/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/Socket/Makefile.in Tue Aug 21 02:22:18 2007
@@ -63,6 +63,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = NetAccessors/Socket
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in Tue Aug 21 02:22:18 2007
@@ -37,6 +37,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = NetAccessors/WinSock
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/libWWW/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/libWWW/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/libWWW/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/libWWW/Makefile.in Tue Aug 21 02:22:18 2007
@@ -70,6 +70,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = NetAccessors/libWWW
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/AIX/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/AIX/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/AIX/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/AIX/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/BeOS/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/BeOS/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/BeOS/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/BeOS/Makefile.in Tue Aug 21 02:22:18 2007
@@ -49,6 +49,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Cygwin/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Cygwin/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Cygwin/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Cygwin/Makefile.in Tue Aug 21 02:22:18 2007
@@ -44,6 +44,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/FreeBSD/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/FreeBSD/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/FreeBSD/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/FreeBSD/Makefile.in Tue Aug 21 02:22:18 2007
@@ -49,6 +49,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/HPUX/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/HPUX/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/HPUX/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/HPUX/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/IRIX/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/IRIX/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/IRIX/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/IRIX/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Interix/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Interix/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Interix/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Interix/Makefile.in Tue Aug 21 02:22:18 2007
@@ -44,6 +44,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Linux/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Linux/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Linux/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Linux/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/MacOS/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/MacOS/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/MacOS/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/MacOS/Makefile.in Tue Aug 21 02:22:18 2007
@@ -34,6 +34,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Platforms/MacOS
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Makefile.in Tue Aug 21 02:22:18 2007
@@ -126,6 +126,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
CD=cd
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/NetBSD/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/NetBSD/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/NetBSD/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/NetBSD/Makefile.in Tue Aug 21 02:22:18 2007
@@ -52,6 +52,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS390/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS390/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS390/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS390/Makefile.in Tue Aug 21 02:22:18 2007
@@ -58,6 +58,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS400/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS400/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS400/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OS400/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OpenServer/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OpenServer/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OpenServer/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/OpenServer/Makefile.in Tue Aug 21 02:22:18 2007
@@ -46,6 +46,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/PTX/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/PTX/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/PTX/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/PTX/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/QNX/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/QNX/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/QNX/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/QNX/Makefile.in Tue Aug 21 02:22:18 2007
@@ -44,6 +44,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Solaris/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Solaris/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Solaris/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Solaris/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Tru64/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Tru64/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Tru64/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Tru64/Makefile.in Tue Aug 21 02:22:18 2007
@@ -34,6 +34,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/UnixWare/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/UnixWare/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/UnixWare/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/UnixWare/Makefile.in Tue Aug 21 02:22:18 2007
@@ -55,6 +55,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Platforms/Win32/Makefile.in Tue Aug 21 02:22:18 2007
@@ -49,6 +49,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Cygwin/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Cygwin/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Cygwin/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Cygwin/Makefile.in Tue Aug 21 02:22:18 2007
@@ -44,6 +44,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Cygwin
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/ICU/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/ICU/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/ICU/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/ICU/Makefile.in Tue Aug 21 02:22:18 2007
@@ -78,6 +78,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/ICU
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv/Makefile.in Tue Aug 21 02:22:18 2007
@@ -78,6 +78,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Iconv
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv390/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv390/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv390/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv390/Makefile.in Tue Aug 21 02:22:18 2007
@@ -56,6 +56,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Iconv390
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv400/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv400/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv400/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Iconv400/Makefile.in Tue Aug 21 02:22:18 2007
@@ -52,6 +52,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Iconv400
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvFBSD/Makefile.in Tue Aug 21 02:22:18 2007
@@ -50,6 +50,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/IconvFBSD
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvGNU/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvGNU/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvGNU/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/IconvGNU/Makefile.in Tue Aug 21 02:22:18 2007
@@ -53,6 +53,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/IconvGNU
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/MacOSUnicodeConverter/Makefile.in Tue Aug 21 02:22:18 2007
@@ -81,6 +81,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/MacOSUnicodeConverter
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Uniconv390/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Uniconv390/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Uniconv390/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Uniconv390/Makefile.in Tue Aug 21 02:22:18 2007
@@ -45,6 +45,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Uniconv390
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in Tue Aug 21 02:22:18 2007
@@ -36,6 +36,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = Transcoders/Win32
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/regx/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/regx/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/regx/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/regx/Makefile.in Tue Aug 21 02:22:18 2007
@@ -80,6 +80,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = util
SUBMODULE = regx
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/DTD/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/DTD/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/DTD/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/DTD/Makefile.in Tue Aug 21 02:22:18 2007
@@ -103,6 +103,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/Makefile.in Tue Aug 21 02:22:18 2007
@@ -73,6 +73,7 @@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
THREADS = @threads@
+LIBTYPE = @libtype@
MODULE = validators
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/common/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/common/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/common/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/common/Makefile.in Tue Aug 21 02:22:18 2007
@@ -77,6 +77,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/datatype/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/datatype/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/datatype/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/datatype/Makefile.in Tue Aug 21 02:22:18 2007
@@ -125,6 +125,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/Makefile.in Tue Aug 21 02:22:18 2007
@@ -126,6 +126,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/identity/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/identity/Makefile.in?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/identity/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/identity/Makefile.in Tue Aug 21 02:22:18 2007
@@ -59,6 +59,7 @@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
THREADS = @threads@
+LIBTYPE = @libtype@
include ../../../Makefile.incl
Modified: xerces/c/branches/xerces-2.7/tests/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/tests/Makefile.incl?rev=568032&r1=568031&r2=568032&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/tests/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/tests/Makefile.incl Tue Aug 21 02:22:18 2007
@@ -377,6 +377,6 @@
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT
LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
- PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -framework CoreServices
SHLIBSUFFIX=.dylib
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org