amassari 2004/07/22 14:55:54
Modified: c/src/xercesc Makefile.incl
Log:
Fix ICU link options (jira#1186] - Patch by Bob Buck
Revision Changes Path
1.57 +8 -8 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Makefile.incl 9 Jul 2004 16:09:12 -0000 1.56
+++ Makefile.incl 22 Jul 2004 21:55:54 -0000 1.57
@@ -137,13 +137,13 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XML_OBJ_DIR) ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = -mt -licuuc -licudata ${LIBS}
+ ALLLIBS = -mt ${LIBS} -licuuc -licudata
else
ALLLIBS = -mt ${LIBS}
endif
ifeq (${MESSAGELOADER}, ICU)
- ALLLIBS = -mt -licuuc -licudata -lXercesMessages ${LIBS}
+ ALLLIBS = -mt ${LIBS} -licuuc -licudata -lXercesMessages
endif
endif
@@ -203,7 +203,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -belf -G ${LDFLAGS}
endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -licu-uc -licudata
+ ALLLIBS = ${LIBS} -licuuc -licudata
else
ALLLIBS = ${LIBS}
endif
@@ -421,7 +421,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
- ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -L${ICUROOT} -licudata -lgcc
+ ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
else
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
ALLLIBS = ${LIBS}
@@ -439,7 +439,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
- ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -L${ICUROOT} -licudata -lgcc
+ ALLLIBS = ${LIBS} -L/usr/local/lib -L${ICUROOT} -licuuc -licudata -lgcc
else
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
ALLLIBS = ${LIBS}
@@ -629,7 +629,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -dynamiclib ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -dynamiclib ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc
-licud ata -lc
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc
-licudata -lc
else
ALLLIBS = ${LIBS} -L/usr/lib
endif
@@ -648,7 +648,7 @@
MAKE_SHARED = ${CXX} -shared ${LDFLAGS}
MAKE_SHARED_C = ${CC} -shared ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc
-licudata -lc
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc
-licudata -lc
else
ALLLIBS = ${LIBS} -L/usr/lib
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
