Author: borisk
Date: Thu Feb 28 06:30:15 2008
New Revision: 631983
URL: http://svn.apache.org/viewvc?rev=631983&view=rev
Log:
Get rid of automake convenience libraries. Link messages for the ICU message
loader directly into libxerces-c instead of a separate library.
Added:
xerces/c/trunk/src/stricmp.c
- copied unchanged from r630224, xerces/c/trunk/lib/stricmp.c
xerces/c/trunk/src/stricmp.h
- copied unchanged from r630224, xerces/c/trunk/lib/stricmp.h
xerces/c/trunk/src/strnicmp.c
- copied unchanged from r630224, xerces/c/trunk/lib/strnicmp.c
xerces/c/trunk/src/strnicmp.h
- copied unchanged from r630224, xerces/c/trunk/lib/strnicmp.h
xerces/c/trunk/src/towlower.c
- copied unchanged from r630224, xerces/c/trunk/lib/towlower.c
xerces/c/trunk/src/towlower.h
- copied unchanged from r630224, xerces/c/trunk/lib/towlower.h
xerces/c/trunk/src/towupper.c
- copied unchanged from r630224, xerces/c/trunk/lib/towupper.c
xerces/c/trunk/src/towupper.h
- copied unchanged from r630224, xerces/c/trunk/lib/towupper.h
Removed:
xerces/c/trunk/lib/
xerces/c/trunk/obj/
Modified:
xerces/c/trunk/Makefile.am
xerces/c/trunk/configure.ac
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces/c/trunk/src/xercesc/util/XMLString.cpp
xerces/c/trunk/tests/Makefile.am
Modified: xerces/c/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Thu Feb 28 06:30:15 2008
@@ -1,14 +1,14 @@
-SUBDIRS = lib src obj tests
samples
+SUBDIRS = src tests samples
-EXTRA_DIST = config/pretty-make \
- scripts/createBindingsFormatFromHPP.pl \
- scripts/makeStringDefinition.pl \
- scripts/packageBinaries.pl \
- scripts/packageSources.pl \
- scripts/sanityTest.pl \
- scripts/sanityTest_ExpectedResult.log
+EXTRA_DIST = config/pretty-make \
+ scripts/createBindingsFormatFromHPP.pl \
+ scripts/makeStringDefinition.pl \
+ scripts/packageBinaries.pl \
+ scripts/packageSources.pl \
+ scripts/sanityTest.pl \
+ scripts/sanityTest_ExpectedResult.log
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
check:
-rm -f tempResult
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Thu Feb 28 06:30:15 2008
@@ -26,16 +26,14 @@
AC_PREREQ(2.60)
AC_INIT([xercesc],[3.0])
AC_CONFIG_SRCDIR([src/Makefile.am])
-AC_CONFIG_LIBOBJ_DIR([lib])
+AC_CONFIG_LIBOBJ_DIR([src])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_autoconf_config.hpp])
AC_CONFIG_FILES([Makefile \
- lib/Makefile \
src/Makefile \
src/xercesc/util/MsgLoaders/ICU/resources/Makefile \
src/xercesc/util/MsgLoaders/MsgCatalog/Makefile \
- obj/Makefile \
tests/Makefile \
samples/Makefile])
@@ -78,6 +76,12 @@
AS_IF([test x$AR = xfalse],
AC_MSG_ERROR([Cannot find a valid 'ar' tool]))
+
+# Export information on whether we are building static/shared libraries.
+# enable_shared and enable_static are defined by AC_PROG_LIBTOOL.
+#
+AC_SUBST([BUILD_SHARED], [$enable_shared])
+AC_SUBST([BUILD_STATIC], [$enable_static])
# Checks for header files.
AC_HEADER_STDC
Modified: xerces/c/trunk/samples/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Thu Feb 28 06:30:15 2008
@@ -21,7 +21,7 @@
bin_PROGRAMS = ${sampleprogs}
-LDADD = ${top_builddir}/obj/libxerces-c.la
+LDADD = ${top_builddir}/src/libxerces-c.la
# the -I${top_builddir}/src is needed to pick the
xercesc/util/Xerces_autoconf_config.hpp
# header file when doing out-of-tree builds
AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Thu Feb 28 06:30:15 2008
@@ -5,9 +5,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,266 +19,183 @@
# $Id$
#
-DEFS += -DXERCES_BUILDING_LIBRARY
-SUBDIRS =
-
-# the -I${top_srcdir} is needed to pick the lib/stricmp.h
-# header file when doing out-of-tree builds
-AM_CXXFLAGS = -I${top_srcdir}
$(ICU_CXXFLAGS)
-
+include ${top_srcdir}/version.incl
+DEFS += -DXERCES_BUILDING_LIBRARY
+SUBDIRS =
#
-# Specify the convenience libraries for various xerces components
-# These are used only during the build process and are not themselves installed
#
-noinst_LTLIBRARIES = libsrc.la ${src_libraries}
+lib_LTLIBRARIES = libxerces-c.la
+# Use AM_* variables instead of per-target ones otherwise the
+# make pretty-printing won't work.
#
-# We build a single convenience library (libsrc.la) that is composed of
-# all the other convenience libraries in this directory. This allows
-# us to decide here, and only here, which libraries the ultimate libXerces
-# will get built from: the libsrc.la library.
-#
-libsrc_la_SOURCES =
-libsrc_la_LIBADD = ${src_libraries}
+AM_CPPFLAGS =
+AM_CXXFLAGS = $(ICU_CXXFLAGS)
+
+libxerces_c_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libxerces_c_ladir = ${includedir} # Not sure what this one if for.
+
+libxerces_c_la_SOURCES = ${util_sources} ${dom_sources} ${domimpl_sources} \
+${framework_sources} ${internal_sources} ${parsers_sources} ${sax_sources} \
+${sax2_sources} ${validators_sources} ${xinclude_sources}
+
+nobase_libxerces_c_la_HEADERS = ${util_headers} ${dom_headers} \
+${domimpl_headers} ${framework_headers} ${internal_headers} \
+${parsers_headers} ${sax_headers} ${sax2_headers} ${validators_headers} \
+${xinclude_headers}
+
+# Make sure autoconf-generated Xerces_autoconf_config.hpp ends up in a
+# proper place when installed.
+#
autoconfheadersdir = $(includedir)/xercesc/util
nodist_autoconfheaders_HEADERS =
${top_builddir}/src/xercesc/util/Xerces_autoconf_config.hpp
+# Compatibility library.
#
-# Build convenience libraries for the various xerces components
-#
-src_libraries =
+EXTRA_DIST = stricmp.h strnicmp.h towlower.h towupper.h
+libxerces_c_la_LIBADD = ${LTLIBOBJS}
-src_libraries += libutil.la
-libutil_ladir = ${includedir}
-nobase_libutil_la_HEADERS = ${util_headers}
-libutil_la_SOURCES = ${util_sources}
-
-src_libraries += libdom.la
-libdom_ladir = ${includedir}
-nobase_libdom_la_HEADERS = ${dom_headers}
-libdom_la_SOURCES = ${dom_sources}
-
-src_libraries += libdomimpl.la
-libdomimpl_ladir = ${includedir}
-nobase_libdomimpl_la_HEADERS = ${domimpl_headers}
-libdomimpl_la_SOURCES = ${domimpl_sources}
-
-src_libraries += libframework.la
-libframework_ladir = ${includedir}
-nobase_libframework_la_HEADERS = ${framework_headers}
-libframework_la_SOURCES = ${framework_sources}
-
-src_libraries += libinternal.la
-libinternal_ladir = ${includedir}
-nobase_libinternal_la_HEADERS = ${internal_headers}
-libinternal_la_SOURCES = ${internal_sources}
-
-src_libraries += libparsers.la
-libparsers_ladir = ${includedir}
-nobase_libparsers_la_HEADERS = ${parsers_headers}
-libparsers_la_SOURCES = ${parsers_sources}
-
-src_libraries += libsax.la
-libsax_ladir = ${includedir}
-nobase_libsax_la_HEADERS = ${sax_headers}
-libsax_la_SOURCES = ${sax_sources}
-
-src_libraries += libsax2.la
-libsax2_ladir = ${includedir}
-nobase_libsax2_la_HEADERS = ${sax2_headers}
-libsax2_la_SOURCES = ${sax2_sources}
-
-src_libraries += libvalidators.la
-libvalidators_ladir = ${includedir}
-nobase_libvalidators_la_HEADERS = ${validators_headers}
-libvalidators_la_SOURCES = ${validators_sources}
-
-src_libraries += libxinclude.la
-libxinclude_ladir = ${includedir}
-nobase_libxinclude_la_HEADERS = ${xinclude_headers}
-libxinclude_la_SOURCES = ${xinclude_sources}
-#
# NetAccessors, conditionally built based on settings from configure
#
if XERCES_USE_NETACCESSOR_CURL
-src_libraries += libcurlna.la
-libcurlna_ladir = ${includedir}
-nobase_libcurlna_la_HEADERS = ${curl_headers}
-libcurlna_la_SOURCES = ${curl_sources}
-libcurlna_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${CURL_PREFIX}/include/curl
+libxerces_c_la_SOURCES += ${curl_sources}
+nobase_libxerces_c_la_HEADERS += ${curl_headers}
+AM_CPPFLAGS += -I${CURL_PREFIX}/include/curl
endif
if XERCES_USE_NETACCESSOR_SOCKET
-src_libraries += libsocketsna.la
-libsocketsna_ladir = ${includedir}
-nobase_libsocketsna_la_HEADERS = ${sockets_headers}
-libsocketsna_la_SOURCES = ${sockets_sources}
+libxerces_c_la_SOURCES += ${sockets_sources}
+nobase_libxerces_c_la_HEADERS += ${sockets_headers}
+AM_CPPFLAGS += -I${CURL_PREFIX}/include/curl
endif
if XERCES_USE_NETACCESSOR_LIBWWW
-src_libraries += libwwwna.la
-libwwwna_ladir = ${includedir}
-nobase_libwwwna_la_HEADERS = ${libwww_headers}
-libwwwna_la_SOURCES = ${libwww_sources}
-libwwwna_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${LIBWWW_PREFIX}/include/w3c-libwww
+libxerces_c_la_SOURCES += ${libwww_sources}
+nobase_libxerces_c_la_HEADERS += ${libwww_headers}
+AM_CPPFLAGS += -I${LIBWWW_PREFIX}/include/w3c-libwww
endif
if XERCES_USE_NETACCESSOR_CFURL
-src_libraries += libcfurlna.la
-libcfurlna_ladir = ${includedir}
-nobase_libcfurlna_la_HEADERS = ${cfurl_headers}
-libcfurlna_la_SOURCES = ${cfurl_sources}
+libxerces_c_la_SOURCES += ${cfurl_sources}
+nobase_libxerces_c_la_HEADERS += ${cfurl_headers}
+AM_CPPFLAGS += -I${LIBWWW_PREFIX}/include/w3c-libwww
endif
if XERCES_USE_NETACCESSOR_WINSOCK
-src_libraries += libwinsockna.la
-libwinsockna_ladir = ${includedir}
-nobase_libwinsockna_la_HEADERS = ${winsock_headers}
-libwinsockna_la_SOURCES = ${winsock_sources}
+libxerces_c_la_SOURCES += ${winsock_sources}
+nobase_libxerces_c_la_HEADERS += ${winsock_headers}
endif
-#
+
# Transcoders, conditionally built based on settings from configure
#
if XERCES_USE_TRANSCODER_ICU
-src_libraries += libicutc.la
-libicutc_ladir = ${includedir}
-nobase_libicutc_la_HEADERS = ${icu_headers}
-libicutc_la_SOURCES = ${icu_sources}
-libicutc_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${ICU_PREFIX}/include
+libxerces_c_la_SOURCES += ${icu_sources}
+nobase_libxerces_c_la_HEADERS += ${icu_headers}
+AM_CPPFLAGS += -I${ICU_PREFIX}/include
endif
if XERCES_USE_TRANSCODER_GNUICONV
-src_libraries += libgnuiconvtc.la
-libgnuiconvtc_ladir = ${includedir}
-nobase_libgnuiconvtc_la_HEADERS = ${gnuiconv_headers}
-libgnuiconvtc_la_SOURCES = ${gnuiconv_sources}
+libxerces_c_la_SOURCES += ${gnuiconv_sources}
+nobase_libxerces_c_la_HEADERS += ${gnuiconv_headers}
endif
if XERCES_USE_TRANSCODER_ICONV
-src_libraries += libiconvtc.la
-libiconvtc_ladir = ${includedir}
-nobase_libiconvtc_la_HEADERS = ${iconv_headers}
-libiconvtc_la_SOURCES = ${iconv_sources}
+libxerces_c_la_SOURCES += ${iconv_sources}
+nobase_libxerces_c_la_HEADERS += ${iconv_headers}
endif
if XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER
-src_libraries +=
libmacosunicodeconverter.la
-libmacosunicodeconverter_ladir = ${includedir}
-nobase_libmacosunicodeconverter_la_HEADERS = ${macosunicodeconverter_headers}
-libmacosunicodeconverter_la_SOURCES =
${macosunicodeconverter_sources}
+libxerces_c_la_SOURCES += ${macosunicodeconverter_sources}
+nobase_libxerces_c_la_HEADERS += ${macosunicodeconverter_headers}
endif
if XERCES_USE_TRANSCODER_WINDOWS
-src_libraries += libwintrans.la
-libwintrans_ladir = ${includedir}
-nobase_libwintrans_la_HEADERS = ${wintrans_headers}
-libwintrans_la_SOURCES = ${wintrans_sources}
+libxerces_c_la_SOURCES += ${wintrans_sources}
+nobase_libxerces_c_la_HEADERS += ${wintrans_headers}
endif
-#
+
# MsgLoaders, conditionally built based on settings from configure
#
if XERCES_USE_MSGLOADER_INMEMORY
-src_libraries += libmsginmemory.la
-libmsginmemory_ladir = ${includedir}
-nobase_libmsginmemory_la_HEADERS = ${msginmemory_headers}
-libmsginmemory_la_SOURCES = ${msginmemory_sources}
+libxerces_c_la_SOURCES += ${msginmemory_sources}
+nobase_libxerces_c_la_HEADERS += ${msginmemory_headers}
endif
if XERCES_USE_MSGLOADER_ICU
-src_libraries += libmsgicu.la
-libmsgicu_ladir = ${includedir}
-nobase_libmsgicu_la_HEADERS = ${msgicu_headers}
-libmsgicu_la_SOURCES = ${msgicu_sources}
+libxerces_c_la_SOURCES += ${msgicu_sources}
+nobase_libxerces_c_la_HEADERS += ${msgicu_headers}
+AM_CPPFLAGS += -I${ICU_PREFIX}/include
-SUBDIRS +=
xercesc/util/MsgLoaders/ICU/resources
+SUBDIRS += xercesc/util/MsgLoaders/ICU/resources
+libxerces_c_la_LIBADD +=
xercesc/util/MsgLoaders/ICU/resources/XercesMessages.lo
endif
if XERCES_USE_MSGLOADER_ICONV
-src_libraries += libmsgiconv.la
-libmsgiconv_ladir = ${includedir}
-nobase_libmsgiconv_la_HEADERS = ${msgiconv_headers}
-libmsgiconv_la_SOURCES = ${msgiconv_sources}
+libxerces_c_la_SOURCES += ${msgiconv_sources}
+nobase_libxerces_c_la_HEADERS += ${msgiconv_headers}
-SUBDIRS +=
xercesc/util/MsgLoaders/MsgCatalog
+SUBDIRS += xercesc/util/MsgLoaders/MsgCatalog
endif
-#
+
# AtomicOp Managers, conditionally built based on settings from configure
#
if XERCES_USE_ATOMICOPMGR_NOTHREAD
-src_libraries += libnothreadaomgr.la
-libnothreadaomgr_ladir = ${includedir}
-nobase_libnothreadaomgr_la_HEADERS =${nothreadaomgr_headers}
-libnothreadaomgr_la_SOURCES = ${nothreadaomgr_sources}
+libxerces_c_la_SOURCES += ${nothreadaomgr_sources}
+nobase_libxerces_c_la_HEADERS += ${nothreadaomgr_headers}
endif
if XERCES_USE_ATOMICOPMGR_POSIX
-src_libraries += libposixaomgr.la
-libposixaomgr_ladir = ${includedir}
-nobase_libposixaomgr_la_HEADERS = ${posixaomgr_headers}
-libposixaomgr_la_SOURCES = ${posixaomgr_sources}
+libxerces_c_la_SOURCES += ${posixaomgr_sources}
+nobase_libxerces_c_la_HEADERS += ${posixaomgr_headers}
endif
if XERCES_USE_ATOMICOPMGR_MACOS
-src_libraries += libmacosaomgr.la
-libmacosaomgr_ladir = ${includedir}
-nobase_libmacosaomgr_la_HEADERS = ${macosaomgr_headers}
-libmacosaomgr_la_SOURCES = ${macosaomgr_sources}
+libxerces_c_la_SOURCES += ${macosaomgr_sources}
+nobase_libxerces_c_la_HEADERS += ${macosaomgr_headers}
endif
if XERCES_USE_ATOMICOPMGR_WINDOWS
-src_libraries += libwinaomgr.la
-libwinaomgr_ladir = ${includedir}
-nobase_libwinaomgr_la_HEADERS = ${winaomgr_headers}
-libwinaomgr_la_SOURCES = ${winaomgr_sources}
+libxerces_c_la_SOURCES += ${winaomgr_sources}
+nobase_libxerces_c_la_HEADERS += ${winaomgr_headers}
endif
-#
+
# Mutex Managers, conditionally built based on settings from configure
#
if XERCES_USE_MUTEXMGR_NOTHREAD
-src_libraries += libnothreadmmgr.la
-libnothreadmmgr_ladir = ${includedir}
-nobase_libnothreadmmgr_la_HEADERS = ${nothreadmmgr_headers}
-libnothreadmmgr_la_SOURCES = ${nothreadmmgr_sources}
+libxerces_c_la_SOURCES += ${nothreadmmgr_sources}
+nobase_libxerces_c_la_HEADERS += ${nothreadmmgr_headers}
endif
if XERCES_USE_MUTEXMGR_POSIX
-src_libraries += libposixmmgr.la
-libposixmmgr_ladir = ${includedir}
-nobase_libposixmmgr_la_HEADERS = ${posixmmgr_headers}
-libposixmmgr_la_SOURCES = ${posixmmgr_sources}
+libxerces_c_la_SOURCES += ${posixmmgr_sources}
+nobase_libxerces_c_la_HEADERS += ${posixmmgr_headers}
endif
if XERCES_USE_MUTEXMGR_WINDOWS
-src_libraries += libwinmmgr.la
-libwinmmgr_ladir = ${includedir}
-nobase_libwinmmgr_la_HEADERS = ${winmmgr_headers}
-libwinmmgr_la_SOURCES = ${winmmgr_sources}
+libxerces_c_la_SOURCES += ${winmmgr_sources}
+nobase_libxerces_c_la_HEADERS += ${winmmgr_headers}
endif
-#
+
# File Managers, conditionally built based on settings from configure
#
if XERCES_USE_FILEMGR_POSIX
-src_libraries += libposixfmgr.la
-libposixfmgr_ladir = ${includedir}
-nobase_libposixfmgr_la_HEADERS = ${posixfmgr_headers}
-libposixfmgr_la_SOURCES = ${posixfmgr_sources}
+libxerces_c_la_SOURCES += ${posixfmgr_sources}
+nobase_libxerces_c_la_HEADERS += ${posixfmgr_headers}
endif
if XERCES_USE_FILEMGR_WINDOWS
-src_libraries += libwinfmgr.la
-libwinfmgr_ladir = ${includedir}
-nobase_libwinfmgr_la_HEADERS = ${winfmgr_headers}
-libwinfmgr_la_SOURCES = ${winfmgr_sources}
+libxerces_c_la_SOURCES += ${winfmgr_sources}
+nobase_libxerces_c_la_HEADERS += ${winfmgr_headers}
endif
#
@@ -347,7 +264,7 @@
xercesc/dom/DOMXPathNSResolver.hpp \
xercesc/dom/DOMXPathResult.hpp \
xercesc/dom/StDOMNode.hpp
-
+
dom_sources = \
xercesc/dom/DOMException.cpp \
xercesc/dom/DOMLSException.cpp \
@@ -402,7 +319,7 @@
xercesc/dom/impl/DOMXPathNSResolverImpl.hpp \
xercesc/dom/impl/DOMXPathResultImpl.hpp \
xercesc/dom/impl/XSDElementNSImpl.hpp
-
+
domimpl_sources = \
xercesc/dom/impl/DOMAttrImpl.cpp \
xercesc/dom/impl/DOMAttrMapImpl.cpp \
@@ -514,7 +431,7 @@
xercesc/framework/XMLSchemaDescription.hpp \
xercesc/framework/XMLValidator.hpp \
xercesc/framework/XMLValidityCodes.hpp
-
+
framework_sources = \
xercesc/framework/BinOutputStream.cpp \
xercesc/framework/LocalFileFormatTarget.cpp \
@@ -597,7 +514,7 @@
xercesc/internal/XSerializeEngine.hpp \
xercesc/internal/XSObjectFactory.hpp \
xercesc/internal/XTemplateSerializer.hpp
-
+
internal_sources = \
xercesc/internal/BinFileOutputStream.cpp \
xercesc/internal/BinMemOutputStream.cpp \
@@ -631,7 +548,7 @@
xercesc/parsers/SAX2XMLReaderImpl.hpp \
xercesc/parsers/SAXParser.hpp \
xercesc/parsers/XercesDOMParser.hpp
-
+
parsers_sources = \
xercesc/parsers/AbstractDOMParser.cpp \
xercesc/parsers/DOMLSParserImpl.cpp \
@@ -653,13 +570,13 @@
xercesc/sax/Parser.hpp \
xercesc/sax/SAXException.hpp \
xercesc/sax/SAXParseException.hpp
-
+
sax_sources = \
xercesc/sax/Dummy.cpp \
xercesc/sax/InputSource.cpp \
xercesc/sax/SAXException.cpp \
xercesc/sax/SAXParseException.cpp
-
+
sax2_headers = \
xercesc/sax2/Attributes.hpp \
@@ -673,7 +590,7 @@
sax2_sources = \
xercesc/sax2/sax2Dummy.cpp
-
+
util_headers = \
xercesc/util/ArrayIndexOutOfBoundsException.hpp \
xercesc/util/Base64.hpp \
@@ -828,7 +745,7 @@
xercesc/util/XMLUTF16Transcoder.hpp \
xercesc/util/XMLUTF8Transcoder.hpp \
xercesc/util/XMLWin1252Transcoder.hpp
-
+
util_sources = \
xercesc/util/Base64.cpp \
xercesc/util/BinFileInputStream.cpp \
@@ -905,8 +822,8 @@
xercesc/util/XMLUTF16Transcoder.cpp \
xercesc/util/XMLUTF8Transcoder.cpp \
xercesc/util/XMLWin1252Transcoder.cpp
-
-
+
+
validators_headers = \
xercesc/validators/common/AllContentModel.hpp \
xercesc/validators/common/CMAny.hpp \
@@ -1004,7 +921,7 @@
xercesc/validators/schema/XSDErrorReporter.hpp \
xercesc/validators/schema/XSDLocator.hpp \
xercesc/validators/schema/XUtil.hpp
-
+
validators_sources = \
xercesc/validators/common/AllContentModel.cpp \
xercesc/validators/common/CMAny.cpp \
@@ -1099,7 +1016,7 @@
xercesc/xinclude/XIncludeDOMDocumentProcessor.hpp \
xercesc/xinclude/XIncludeLocation.hpp \
xercesc/xinclude/XIncludeUtils.hpp
-
+
xinclude_sources = \
xercesc/xinclude/XIncludeDOMDocumentProcessor.cpp \
xercesc/xinclude/XIncludeLocation.cpp \
@@ -1125,7 +1042,7 @@
macosunicodeconverter_headers = \
xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
-
+
macosunicodeconverter_sources = \
xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
@@ -1139,39 +1056,39 @@
curl_headers = \
xercesc/util/NetAccessors/Curl/CurlNetAccessor.hpp \
xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp
-
+
curl_sources = \
xercesc/util/NetAccessors/Curl/CurlNetAccessor.cpp \
xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp
-
+
sockets_headers = \
xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp \
xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
-
+
sockets_sources = \
xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp \
xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
-
+
libwww_headers = \
xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp \
xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
-
+
libwww_sources = \
xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp \
xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
-
+
cfurl_headers = \
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp \
xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
-
+
cfurl_sources = \
xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp \
xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
-
+
winsock_headers = \
xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp \
xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
-
+
winsock_sources = \
xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp \
xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
@@ -1180,20 +1097,20 @@
msginmemory_headers = \
xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp \
xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
-
+
msginmemory_sources = \
xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
msgicu_headers = \
xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
-
+
msgicu_sources = \
xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
msgiconv_headers = \
xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp \
xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp
-
+
msgiconv_sources = \
xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
@@ -1267,7 +1184,7 @@
xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp \
xercesc/util/Platforms/MacOS/MacPosixFile.cpp
-#
+
# Override generated rules to provide prettier make rules
#
# Warning: If Automake changes sufficiently, these rules may need to
@@ -1275,6 +1192,14 @@
#
if XERCES_PRETTY_MAKE
+.c.lo:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f
"$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @source='$<' object='$@'
libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCOMPILE) -c -o $@ $<
+
.cpp.lo:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo"
-c -o $@ $<; \
@@ -1288,6 +1213,14 @@
endif
+COMPILE = ${PRETTY_COMPILE} \
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CC --mode=compile \
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
CXXCOMPILE = ${PRETTY_COMPILE} \
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -1295,7 +1228,3 @@
$(LIBTOOL) --quiet --tag=CXX --mode=compile \
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-
-
-
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in Thu
Feb 28 06:30:15 2008
@@ -1,20 +1,21 @@
-# Copyright (c) 2001-2002 IBM, Inc. and others
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
-# File
-# icu/source/samples/ufortune/resources/Makefile
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Two ICU tools are run from this makefile:
-# genrb compiles a resource source file (.txt) into
-# a binary .res file.
-# pkgdata combines all of the .res files into a single
-# shared library that can then be linked with the
-# maRESTARGETin application.
-#
-# pkgdata will recursively generate and run yet
-# another makefile, which in turn runs two more
-# icu tools. gencmn combines the individual .res
-# files, and genccode emits the data as C source
-# code that can then be built into a .so
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# TODO:
+# @@ get rid of unused vars
#
srcdir = @srcdir@
@@ -29,31 +30,33 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
mkdir_p = @mkdir_p@
+CC = @CC@
+CXX = @CXX@
+AR = @AR@
+RANLIB = @RANLIB@
+CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LIBTOOL = @LIBTOOL@
+LDFLAGS = @LDFLAGS@
+
+BUILD_SHARED = @BUILD_SHARED@
+BUILD_STATIC = @BUILD_STATIC@
+
# Special build rules
include $(top_srcdir)/version.incl
GENRB=$(ICU_PREFIX)/bin/genrb
GENRBOPT=--package-name $(PKGNAME)
PKGDATA=$(ICU_PREFIX)/bin/pkgdata
-PKGDATAOPTS=-v -d .
-RMV=rm -rf
-# No conventional target - this dir is resources only.
-TARGET=
-CLEANFILES += *.[co] *.lst *.a *.$(SO) $(RESFILES) *.ao README*resources.txt
+# Add -v if you want to see more verbose output.
+#
+PKGDATAOPTS=-d . -M '"CC=$(CC)" "CXX=$(CXX)" "AR=$(AR)" "RANLIB=$(RANLIB)" \
+"CPPFLAGS=$(CPPFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "LDFLAGS=$(LDFLAGS)"'
# Resource shortname
PKGNAME=XercesMessages$(VER)
-# DLL and static modes are identical here
-RESLDFLAGS= -L$(RESDIR) -l$(PKGNAME)
-RESCPPFLAGS=
-
-# target file for resource bundle - this must be set, or 'make all' won't
-# build any resources.
-RESTARGET=$(top_builddir)/obj/.libs/lib$(PKGNAME)$(SHREXT)
-PKGTARGET=lib$(PKGNAME)$(SHREXT)
-
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
RESFILES=$(PKGNAME)_en_US.res
@@ -61,41 +64,61 @@
# list of resource bundles - keep in sync with RESFILES
RESLIST=$(srcdir)/res-file-list-unix.txt
-# list of targets that aren't actually created
-.PHONY: report
-
-check: all
-
-all: $(RESTARGET) $(TARGET)
-
-$(TARGET): $(OBJECTS)
- $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ $(XTRALIBS)
+#
+#
+.PHONY: all
+all: XercesMessages.lo
-$(RESTARGET): $(RESFILES)
- @echo building $(RESTARGET)
+XercesMessages.lo: $(RESFILES)
+ifeq ($(BUILD_SHARED),yes)
$(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTS) $(RESLIST)
- $(mkdir_p) $(top_builddir)/obj/.libs
- mv $(PKGTARGET) $(RESTARGET)
-
-# clean out files
-distclean clean: $(CLEAN_SUBDIR)
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- -rm $(OBJECTS) $(TARGET) $(RESTARGET) $(RESFILES)
+ mv $(PKGNAME)_dat.o $(PKGNAME)_dat-pic.o
+endif
+ifeq ($(BUILD_STATIC),yes)
+ $(PKGDATA) --name $(PKGNAME) --mode static $(PKGDATAOPTS) $(RESLIST)
+endif
+ @echo "# $@ - a libtool object file" >$@
+ @echo "# Generated by `$(LIBTOOL) --version | \
+sed -e 's/^\([^ ]*\) (GNU \(.*\)) \(.*\)$$/\1 - GNU \2 \3/' -e q`" >>$@
+ @echo "" >>$@
+ifeq ($(BUILD_SHARED),yes)
+ @echo "pic_object='$(PKGNAME)_dat-pic.o'" >>$@
+else
+ @echo "pic_object=none" >>$@
+endif
+ifeq ($(BUILD_STATIC),yes)
+ @echo "non_pic_object='$(PKGNAME)_dat.o'" >>$@
+else
+ @echo "non_pic_object=none" >>$@
+endif
-## resources
$(PKGNAME)_%.res: $(srcdir)/%.txt
- @echo "generating $@"
$(GENRB) $(GENRBOPT) $^
-# Needed to support "make install" and "make uninstall"
-install: $(RESTARGET)
- $(mkdir_p) $(libdir)
- $(INSTALL_PROGRAM) $(RESTARGET) $(libdir)
+# Let the corresponding tools (pkgdata, libtool) clean up their own
+# files. pkgdata does not remove the .dat and README file for some
+# reason.
+#
+distclean clean:
+ rm -f XercesMessages.lo
+ifeq ($(BUILD_SHARED),yes)
+ $(PKGDATA) --name $(PKGNAME) --mode dll --clean $(PKGDATAOPTS)
$(RESLIST)
+ rm -f $(PKGNAME)_dat-pic.o
+endif
+ifeq ($(BUILD_STATIC),yes)
+ $(PKGDATA) --name $(PKGNAME) --mode static --clean $(PKGDATAOPTS)
$(RESLIST)
+ rm -f README_$(PKGNAME).txt
+endif
+ rm -f $(RESFILES)
+ rm -f $(PKGNAME).dat
-uninstall:
- -rm $(libdir)/$(PKGTARGET)
+#
+#
+.PHONY: check
+check: all
-# Needed to support "make dist"
+# Support for "make dist"
+#
distdir:
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -122,3 +145,9 @@
|| exit 1; \
fi; \
done
+
+
+# Nothing to do for these targets.
+#
+install: ; @:
+uninstall: ; @:
Modified: xerces/c/trunk/src/xercesc/util/XMLString.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLString.cpp?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLString.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLString.cpp Thu Feb 28 06:30:15 2008
@@ -28,10 +28,10 @@
#endif
#if !HAVE_STRICMP
-# include <lib/stricmp.h>
+# include <stricmp.h>
#endif
#if !HAVE_STRNICMP
-# include <lib/strnicmp.h>
+# include <strnicmp.h>
#endif
#include <string.h>
Modified: xerces/c/trunk/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.am?rev=631983&r1=631982&r2=631983&view=diff
==============================================================================
--- xerces/c/trunk/tests/Makefile.am (original)
+++ xerces/c/trunk/tests/Makefile.am Thu Feb 28 06:30:15 2008
@@ -21,7 +21,7 @@
check_PROGRAMS = ${testprogs}
-LDADD =
${top_builddir}/obj/libxerces-c.la
+LDADD =
${top_builddir}/src/libxerces-c.la
# the -I${top_builddir}/src is needed to pick the
xercesc/util/Xerces_autoconf_config.hpp
# header file when doing out-of-tree builds
AM_CPPFLAGS = -I${top_builddir}/src
-I${top_srcdir}/src
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
