Author: jberry
Date: Thu May 26 18:52:43 2005
New Revision: 178725
URL: http://svn.apache.org/viewcvs?rev=178725&view=rev
Log:
More work on pthreads flags
Modified:
xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.am?rev=178725&r1=178724&r2=178725&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Thu May 26 18:52:43
2005
@@ -86,7 +86,7 @@
libvalidators_la_SOURCES = ${validators_sources}
#
-# Transcoders, conditionally built based on settings from configure
+# NetAccessors, conditionally built based on settings from configure
#
if XERCES_USE_NETACCESSOR_SOCKET
src_libraries += libsockets.la
@@ -110,7 +110,7 @@
libicu_ladir = ${includedir}
nobase_libicu_la_HEADERS = ${icu_headers}
libicu_la_SOURCES = ${icu_sources}
-libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include
+libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include
$(AM_CPPFLAGS)
libicu_la_LIBADD = -L${ICU_PREFIX}/lib
-licuuc -licudata
endif
@@ -180,7 +180,7 @@
nobase_libposixmmgr_la_HEADERS = ${posixmmgr_headers}
libposixmmgr_la_SOURCES = ${posixmmgr_sources}
libposixmmgr_la_LIBADD = ${PTHREAD_LIBS}
-libposixmmgr_la_CFLAGS = ${PTHREAD_CFLAGS}
+libposixmmgr_la_CPPFLAGS = ${PTHREAD_CFLAGS} $(AM_CPPFLAGS)
endif
#
@@ -192,17 +192,6 @@
nobase_libposixfmgr_la_HEADERS = ${posixfmgr_headers}
libposixfmgr_la_SOURCES = ${posixfmgr_sources}
endif
-
-#
-# TEMPORARY PLATFORM SUPPORT
-#
-#src_libraries += libmacplatform.la
-#libmacplatform_ladir = ${includedir}
-#nobase_libmacplatform_la_HEADERS = ${macplatform_headers}
-#libmacplatform_la_SOURCES = ${macplatform_sources}
-#libmacplatform_la_CPPFLAGS = -DXML_USE_NETACCESSOR_URLACCESSCF \
-#
-DXML_USE_MACOS_UNICODECONVERTER \
-#
-DXML_USE_INMEMORY_MSGLOADER
#
# Definition of sources/headers for each convenience library
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=178725&r1=178724&r2=178725&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Thu May 26 18:52:43
2005
@@ -61,7 +61,7 @@
host_triplet = @host@
#
-# Transcoders, conditionally built based on settings from configure
+# NetAccessors, conditionally built based on settings from configure
#
@[EMAIL PROTECTED] = libsockets.la
@[EMAIL PROTECTED] = libcfurl.la
@@ -359,7 +359,8 @@
@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__DEPENDENCIES_1)
am__libposixmmgr_la_SOURCES_DIST = \
xercesc/util/MutexManagers/PosixMutexMgr.cpp
-am__objects_16 = xercesc/util/MutexManagers/PosixMutexMgr.lo
+am__objects_16 = \
+ xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo
@[EMAIL PROTECTED] = \
@XERCES_USE_MUTEXMGR_POSIX_TRUE@ $(am__objects_16)
libposixmmgr_la_OBJECTS = $(am_libposixmmgr_la_OBJECTS)
@@ -888,7 +889,7 @@
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${icu_headers}
@[EMAIL PROTECTED] = ${icu_sources}
[EMAIL PROTECTED]@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include
[EMAIL PROTECTED]@libicu_la_CPPFLAGS = -I${ICU_PREFIX}/include $(AM_CPPFLAGS)
@[EMAIL PROTECTED] = -L${ICU_PREFIX}/lib -licuuc -licudata
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${iconv_headers}
@@ -917,23 +918,12 @@
@[EMAIL PROTECTED] = ${posixmmgr_headers}
@[EMAIL PROTECTED] = ${posixmmgr_sources}
@[EMAIL PROTECTED] = ${PTHREAD_LIBS}
[EMAIL PROTECTED]@libposixmmgr_la_CFLAGS = ${PTHREAD_CFLAGS}
[EMAIL PROTECTED]@libposixmmgr_la_CPPFLAGS = ${PTHREAD_CFLAGS} $(AM_CPPFLAGS)
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${posixfmgr_headers}
@[EMAIL PROTECTED] = ${posixfmgr_sources}
#
-# TEMPORARY PLATFORM SUPPORT
-#
-#src_libraries += libmacplatform.la
-#libmacplatform_ladir = ${includedir}
-#nobase_libmacplatform_la_HEADERS = ${macplatform_headers}
-#libmacplatform_la_SOURCES = ${macplatform_sources}
-#libmacplatform_la_CPPFLAGS = -DXML_USE_NETACCESSOR_URLACCESSCF \
-#
-DXML_USE_MACOS_UNICODECONVERTER \
-#
-DXML_USE_INMEMORY_MSGLOADER
-
-#
# Definition of sources/headers for each convenience library
#
@@ -2267,7 +2257,7 @@
xercesc/util/FileManagers/$(DEPDIR)/$(am__dirstamp)
libposixfmgr.la: $(libposixfmgr_la_OBJECTS) $(libposixfmgr_la_DEPENDENCIES)
$(CXXLINK) $(am_libposixfmgr_la_rpath) $(libposixfmgr_la_LDFLAGS)
$(libposixfmgr_la_OBJECTS) $(libposixfmgr_la_LIBADD) $(LIBS)
-xercesc/util/MutexManagers/PosixMutexMgr.lo: \
+xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo: \
xercesc/util/MutexManagers/$(am__dirstamp) \
xercesc/util/MutexManagers/$(DEPDIR)/$(am__dirstamp)
libposixmmgr.la: $(libposixmmgr_la_OBJECTS) $(libposixmmgr_la_DEPENDENCIES)
@@ -3064,8 +3054,8 @@
-rm -f xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.lo
-rm -f xercesc/util/MutexManagers/NoThreadMutexMgr.$(OBJEXT)
-rm -f xercesc/util/MutexManagers/NoThreadMutexMgr.lo
- -rm -f xercesc/util/MutexManagers/PosixMutexMgr.$(OBJEXT)
- -rm -f xercesc/util/MutexManagers/PosixMutexMgr.lo
+ -rm -f
xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.$(OBJEXT)
+ -rm -f xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo
-rm -f xercesc/util/Mutexes.$(OBJEXT)
-rm -f xercesc/util/Mutexes.lo
-rm -f
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.$(OBJEXT)
@@ -3560,7 +3550,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/FileManagers/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/MsgLoaders/InMemory/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/MutexManagers/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL
PROTECTED]/util/MutexManagers/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL
PROTECTED]/util/MutexManagers/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/NetAccessors/MacOSURLAccessCF/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL
PROTECTED]/util/NetAccessors/Socket/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -3712,6 +3702,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@
source='xercesc/util/Transcoders/ICU/ICUTransService.cpp'
object='xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libicu_la_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS) -c -o
xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo `test -f
'xercesc/util/Transcoders/ICU/ICUTransService.cpp' || echo
'$(srcdir)/'`xercesc/util/Transcoders/ICU/ICUTransService.cpp
+
+xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo:
xercesc/util/MutexManagers/PosixMutexMgr.cpp
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libposixmmgr_la_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS) -MT
xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo -MD -MP -MF
"xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo" -c -o
xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo `test -f
'xercesc/util/MutexManagers/PosixMutexMgr.cpp' || echo
'$(srcdir)/'`xercesc/util/MutexManagers/PosixMutexMgr.cpp; \
[EMAIL PROTECTED]@ then mv -f
"xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo"
"xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Plo"; else
rm -f "xercesc/util/MutexManagers/$(DEPDIR)/libposixmmgr_la-PosixMutexMgr.Tpo";
exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@
source='xercesc/util/MutexManagers/PosixMutexMgr.cpp'
object='xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo'
libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libposixmmgr_la_CPPFLAGS) $(CPPFLAGS)
$(AM_CXXFLAGS) $(CXXFLAGS) -c -o
xercesc/util/MutexManagers/libposixmmgr_la-PosixMutexMgr.lo `test -f
'xercesc/util/MutexManagers/PosixMutexMgr.cpp' || echo
'$(srcdir)/'`xercesc/util/MutexManagers/PosixMutexMgr.cpp
mostlyclean-libtool:
-rm -f *.lo
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
