You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/06/01 20:18:38 UTC
svn commit: r179393 [3/5] - in /xerces/c/branches/jberry/3.0-unstable: ./
lib/ m4/ obj/ samples/ src/ src/xercesc/util/
src/xercesc/util/AtomicOpManagers/ src/xercesc/util/FileManagers/
src/xercesc/util/MutexManagers/ src/xercesc/util/NetAccessors/WinSock/
src/xercesc/util/Transcoders/Win32/
Modified: xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Wed Jun 1 11:18:35 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in iswspace.c \
@@ -99,11 +98,11 @@
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libcompat_la_SOURCES)
DIST_SOURCES = $(libcompat_la_SOURCES)
@@ -114,7 +113,6 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -180,14 +178,20 @@
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@
XERCES_USE_ATOMICOPMGR_POSIX_FALSE = @XERCES_USE_ATOMICOPMGR_POSIX_FALSE@
XERCES_USE_ATOMICOPMGR_POSIX_TRUE = @XERCES_USE_ATOMICOPMGR_POSIX_TRUE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE = @XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE = @XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE@
XERCES_USE_FILEMGR_POSIX_FALSE = @XERCES_USE_FILEMGR_POSIX_FALSE@
XERCES_USE_FILEMGR_POSIX_TRUE = @XERCES_USE_FILEMGR_POSIX_TRUE@
+XERCES_USE_FILEMGR_WINDOWS_FALSE = @XERCES_USE_FILEMGR_WINDOWS_FALSE@
+XERCES_USE_FILEMGR_WINDOWS_TRUE = @XERCES_USE_FILEMGR_WINDOWS_TRUE@
XERCES_USE_MSGLOADER_INMEMORY_FALSE = @XERCES_USE_MSGLOADER_INMEMORY_FALSE@
XERCES_USE_MSGLOADER_INMEMORY_TRUE = @XERCES_USE_MSGLOADER_INMEMORY_TRUE@
XERCES_USE_MUTEXMGR_NOTHREAD_FALSE = @XERCES_USE_MUTEXMGR_NOTHREAD_FALSE@
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE = @XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@
XERCES_USE_MUTEXMGR_POSIX_FALSE = @XERCES_USE_MUTEXMGR_POSIX_FALSE@
XERCES_USE_MUTEXMGR_POSIX_TRUE = @XERCES_USE_MUTEXMGR_POSIX_TRUE@
+XERCES_USE_MUTEXMGR_WINDOWS_FALSE = @XERCES_USE_MUTEXMGR_WINDOWS_FALSE@
+XERCES_USE_MUTEXMGR_WINDOWS_TRUE = @XERCES_USE_MUTEXMGR_WINDOWS_TRUE@
XERCES_USE_NETACCESSOR_CFURL_FALSE = @XERCES_USE_NETACCESSOR_CFURL_FALSE@
XERCES_USE_NETACCESSOR_CFURL_TRUE = @XERCES_USE_NETACCESSOR_CFURL_TRUE@
XERCES_USE_NETACCESSOR_CURL_FALSE = @XERCES_USE_NETACCESSOR_CURL_FALSE@
@@ -204,7 +208,8 @@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@
-ac_ct_AR = @ac_ct_AR@
+XERCES_USE_TRANSCODER_WINDOWS_FALSE = @XERCES_USE_TRANSCODER_WINDOWS_FALSE@
+XERCES_USE_TRANSCODER_WINDOWS_TRUE = @XERCES_USE_TRANSCODER_WINDOWS_TRUE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4 Wed Jun 1 11:18:35 2005
@@ -27,8 +27,9 @@
AS_IF([test -z "$mgr"],
[
case $host_os in
- windows* | cygwin*)
- #mgr=Windows
+ windows* | cygwin* | mingw*)
+ mgr=Windows;
+ AC_DEFINE([XERCES_USE_ATOMICOPMGR_WINDOWS], 1, [Define to use the Windows AtomicOp mgr])
;;
darwin*)
# On MacOS, use the built-in AtomicOp primitives
@@ -56,6 +57,7 @@
AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_NOTHREAD], [test x"$mgr" = xNoThreads])
AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_POSIX], [test x"$mgr" = xPOSIX])
AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_MACOS], [test x"$mgr" = xMacOS])
+ AM_CONDITIONAL([XERCES_USE_ATOMICOPMGR_WINDOWS], [test x"$mgr" = xWindows])
]
)
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_filemgr_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_filemgr_selection.m4?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_filemgr_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_filemgr_selection.m4 Wed Jun 1 11:18:35 2005
@@ -17,8 +17,9 @@
# Platform specific checks
case $host_os in
- windows* | cygwin*)
- #mgr=Windows
+ windows* | cygwin* | mingw*)
+ mgr=Windows;
+ AC_DEFINE([XERCES_USE_FILEMGR_WINDOWS], 1, [Define to use the Windows file mgr])
;;
esac
@@ -33,6 +34,7 @@
# Define the auto-make conditionals which determine what actually gets compiled
# Note that these macros can't be executed conditionally, which is why they're here, not above.
AM_CONDITIONAL([XERCES_USE_FILEMGR_POSIX], [test x"$mgr" = xPOSIX])
+ AM_CONDITIONAL([XERCES_USE_FILEMGR_WINDOWS],[test x"$mgr" = xWindows])
]
)
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_mutexmgr_selection.m4 Wed Jun 1 11:18:35 2005
@@ -21,15 +21,16 @@
AS_IF([test x$xerces_cv_no_threads = xyes],
[
mgr=NoThreads
- AC_DEFINE([XERCES_USE_MUTEXMGR_NOTHREAD], 1, [Define to use the NoThread Mutex mgr])
+ AC_DEFINE([XERCES_USE_MUTEXMGR_NOTHREAD], 1, [Define to use the NoThread mutex mgr])
])
# Platform specific checks
AS_IF([test -z "$mgr"],
[
case $host_os in
- windows* | cygwin*)
- #mgr=Windows
+ windows* | cygwin* | mingw*)
+ mgr=Windows;
+ AC_DEFINE([XERCES_USE_MUTEXMGR_WINDOWS], 1, [Define to use the Windows mutex mgr])
;;
esac
])
@@ -55,6 +56,7 @@
# Note that these macros can't be executed conditionally, which is why they're here, not above.
AM_CONDITIONAL([XERCES_USE_MUTEXMGR_NOTHREAD], [test x"$mgr" = xNoThreads])
AM_CONDITIONAL([XERCES_USE_MUTEXMGR_POSIX], [test x"$mgr" = xPOSIX])
+ AM_CONDITIONAL([XERCES_USE_MUTEXMGR_WINDOWS], [test x"$mgr" = xWindows])
]
)
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4 Wed Jun 1 11:18:35 2005
@@ -87,8 +87,7 @@
[AC_MSG_RESULT(no)]
)
;;
- windows*)
- # TODO: FINALIZE THIS TEST FOR AVAILABILITY OF WINSOCK NETACCESSOR
+ windows* | mingw*)
list_add=
AC_MSG_CHECKING([whether we can support the WinSock NetAccessor (Windows)])
AC_ARG_ENABLE([netaccessor-winsock],
@@ -171,7 +170,7 @@
# Note that these macros can't be executed conditionally, which is why they're here, not above.
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_CURL], [test x"$netaccessor" = xcurl])
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_CFURL], [test x"$netaccessor" = xcfurl])
- AM_CONDITIONAL([XERCES_USE_NETACCESSOR_WINSOCK], [test x"$netaccessor" = xwinsockl])
+ AM_CONDITIONAL([XERCES_USE_NETACCESSOR_WINSOCK], [test x"$netaccessor" = xwinsock])
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_SOCKET], [test x"$netaccessor" = xsocket])
AM_CONDITIONAL([XERCES_USE_NETACCESSOR_LIBWWW], [test x"$netaccessor" = xlibwww])
Modified: xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4 (original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4 Wed Jun 1 11:18:35 2005
@@ -76,11 +76,23 @@
[AC_MSG_RESULT(no)]
)
;;
+ windows* | cygwin* | mingw*)
+ AC_MSG_CHECKING([whether we can support the Windows Transcoder])
+ AC_ARG_ENABLE([transcoder-windows],
+ AS_HELP_STRING([--enable-transcoder-windows],
+ [Enable Windows-based transcoder support]),
+ [AS_IF([test x"$enableval" = xyes],
+ [list_add=WINDOWS])],
+ [list_add=windows])
+ AS_IF([test x"$list_add" != x],
+ [tc_list="$tc_list -$list_add-"; AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
+ ;;
esac
# TODO: Tests for additional transcoders
-
######################################################
# Determine which transcoder to use.
#
@@ -118,6 +130,12 @@
break
;;
+ *-windows-*)
+ transcoder=windows
+ AC_DEFINE([XERCES_USE_TRANSCODER_WINDOWS], 1, [Define to use the Windows transcoder])
+ break
+ ;;
+
*)
if [test $i -eq 2]; then
AC_MSG_RESULT([none])
@@ -135,6 +153,7 @@
AM_CONDITIONAL([XERCES_USE_TRANSCODER_ICU], [test x"$transcoder" = xicu])
AM_CONDITIONAL([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], [test x"$transcoder" = xmacosunicodeconverter])
AM_CONDITIONAL([XERCES_USE_TRANSCODER_ICONV], [test x"$transcoder" = xiconv])
+ AM_CONDITIONAL([XERCES_USE_TRANSCODER_WINDOWS], [test x"$transcoder" = xwindows])
]
)
Modified: xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Wed Jun 1 11:18:35 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
subdir = obj
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -105,11 +104,11 @@
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libxerces_la_SOURCES) $(nodist_EXTRA_libxerces_la_SOURCES)
DIST_SOURCES = $(libxerces_la_SOURCES)
@@ -120,7 +119,6 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -186,14 +184,20 @@
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@
XERCES_USE_ATOMICOPMGR_POSIX_FALSE = @XERCES_USE_ATOMICOPMGR_POSIX_FALSE@
XERCES_USE_ATOMICOPMGR_POSIX_TRUE = @XERCES_USE_ATOMICOPMGR_POSIX_TRUE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE = @XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE = @XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE@
XERCES_USE_FILEMGR_POSIX_FALSE = @XERCES_USE_FILEMGR_POSIX_FALSE@
XERCES_USE_FILEMGR_POSIX_TRUE = @XERCES_USE_FILEMGR_POSIX_TRUE@
+XERCES_USE_FILEMGR_WINDOWS_FALSE = @XERCES_USE_FILEMGR_WINDOWS_FALSE@
+XERCES_USE_FILEMGR_WINDOWS_TRUE = @XERCES_USE_FILEMGR_WINDOWS_TRUE@
XERCES_USE_MSGLOADER_INMEMORY_FALSE = @XERCES_USE_MSGLOADER_INMEMORY_FALSE@
XERCES_USE_MSGLOADER_INMEMORY_TRUE = @XERCES_USE_MSGLOADER_INMEMORY_TRUE@
XERCES_USE_MUTEXMGR_NOTHREAD_FALSE = @XERCES_USE_MUTEXMGR_NOTHREAD_FALSE@
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE = @XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@
XERCES_USE_MUTEXMGR_POSIX_FALSE = @XERCES_USE_MUTEXMGR_POSIX_FALSE@
XERCES_USE_MUTEXMGR_POSIX_TRUE = @XERCES_USE_MUTEXMGR_POSIX_TRUE@
+XERCES_USE_MUTEXMGR_WINDOWS_FALSE = @XERCES_USE_MUTEXMGR_WINDOWS_FALSE@
+XERCES_USE_MUTEXMGR_WINDOWS_TRUE = @XERCES_USE_MUTEXMGR_WINDOWS_TRUE@
XERCES_USE_NETACCESSOR_CFURL_FALSE = @XERCES_USE_NETACCESSOR_CFURL_FALSE@
XERCES_USE_NETACCESSOR_CFURL_TRUE = @XERCES_USE_NETACCESSOR_CFURL_TRUE@
XERCES_USE_NETACCESSOR_CURL_FALSE = @XERCES_USE_NETACCESSOR_CURL_FALSE@
@@ -210,7 +214,8 @@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@
-ac_ct_AR = @ac_ct_AR@
+XERCES_USE_TRANSCODER_WINDOWS_FALSE = @XERCES_USE_TRANSCODER_WINDOWS_FALSE@
+XERCES_USE_TRANSCODER_WINDOWS_TRUE = @XERCES_USE_TRANSCODER_WINDOWS_TRUE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
Modified: xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in?rev=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in Wed Jun 1 11:18:35 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = $(am__EXEEXT_1)
subdir = samples
@@ -176,7 +175,7 @@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(CreateDOMDocument_SOURCES) $(DOMCount_SOURCES) \
$(DOMPrint_SOURCES) $(EnumVal_SOURCES) $(MemParse_SOURCES) \
@@ -197,7 +196,6 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
-AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -263,14 +261,20 @@
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE@
XERCES_USE_ATOMICOPMGR_POSIX_FALSE = @XERCES_USE_ATOMICOPMGR_POSIX_FALSE@
XERCES_USE_ATOMICOPMGR_POSIX_TRUE = @XERCES_USE_ATOMICOPMGR_POSIX_TRUE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE = @XERCES_USE_ATOMICOPMGR_WINDOWS_FALSE@
+XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE = @XERCES_USE_ATOMICOPMGR_WINDOWS_TRUE@
XERCES_USE_FILEMGR_POSIX_FALSE = @XERCES_USE_FILEMGR_POSIX_FALSE@
XERCES_USE_FILEMGR_POSIX_TRUE = @XERCES_USE_FILEMGR_POSIX_TRUE@
+XERCES_USE_FILEMGR_WINDOWS_FALSE = @XERCES_USE_FILEMGR_WINDOWS_FALSE@
+XERCES_USE_FILEMGR_WINDOWS_TRUE = @XERCES_USE_FILEMGR_WINDOWS_TRUE@
XERCES_USE_MSGLOADER_INMEMORY_FALSE = @XERCES_USE_MSGLOADER_INMEMORY_FALSE@
XERCES_USE_MSGLOADER_INMEMORY_TRUE = @XERCES_USE_MSGLOADER_INMEMORY_TRUE@
XERCES_USE_MUTEXMGR_NOTHREAD_FALSE = @XERCES_USE_MUTEXMGR_NOTHREAD_FALSE@
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE = @XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@
XERCES_USE_MUTEXMGR_POSIX_FALSE = @XERCES_USE_MUTEXMGR_POSIX_FALSE@
XERCES_USE_MUTEXMGR_POSIX_TRUE = @XERCES_USE_MUTEXMGR_POSIX_TRUE@
+XERCES_USE_MUTEXMGR_WINDOWS_FALSE = @XERCES_USE_MUTEXMGR_WINDOWS_FALSE@
+XERCES_USE_MUTEXMGR_WINDOWS_TRUE = @XERCES_USE_MUTEXMGR_WINDOWS_TRUE@
XERCES_USE_NETACCESSOR_CFURL_FALSE = @XERCES_USE_NETACCESSOR_CFURL_FALSE@
XERCES_USE_NETACCESSOR_CFURL_TRUE = @XERCES_USE_NETACCESSOR_CFURL_TRUE@
XERCES_USE_NETACCESSOR_CURL_FALSE = @XERCES_USE_NETACCESSOR_CURL_FALSE@
@@ -287,7 +291,8 @@
XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@
-ac_ct_AR = @ac_ct_AR@
+XERCES_USE_TRANSCODER_WINDOWS_FALSE = @XERCES_USE_TRANSCODER_WINDOWS_FALSE@
+XERCES_USE_TRANSCODER_WINDOWS_TRUE = @XERCES_USE_TRANSCODER_WINDOWS_TRUE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@@ -826,36 +831,36 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -rm -f src/CreateDOMDocument/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/CreateDOMDocument/$(am__dirstamp)
- -rm -f src/DOMCount/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/DOMCount/$(am__dirstamp)
- -rm -f src/DOMPrint/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/DOMPrint/$(am__dirstamp)
- -rm -f src/EnumVal/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/EnumVal/$(am__dirstamp)
- -rm -f src/MemParse/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/SEnumVal/$(DEPDIR)/$(am__dirstamp)
-rm -f src/MemParse/$(am__dirstamp)
- -rm -f src/PParse/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/EnumVal/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/DOMCount/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/SAXPrint/$(DEPDIR)/$(am__dirstamp)
-rm -f src/PParse/$(am__dirstamp)
- -rm -f src/PSVIWriter/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/PSVIWriter/$(am__dirstamp)
+ -rm -f src/SCMPrint/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/SAX2Print/$(am__dirstamp)
-rm -f src/Redirect/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/Redirect/$(am__dirstamp)
- -rm -f src/SAX2Count/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/SAX2Count/$(am__dirstamp)
+ -rm -f src/PParse/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/CreateDOMDocument/$(am__dirstamp)
-rm -f src/SAX2Print/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/SAX2Print/$(am__dirstamp)
- -rm -f src/SAXCount/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/StdInParse/$(DEPDIR)/$(am__dirstamp)
-rm -f src/SAXCount/$(am__dirstamp)
- -rm -f src/SAXPrint/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/SAXPrint/$(am__dirstamp)
- -rm -f src/SCMPrint/$(DEPDIR)/$(am__dirstamp)
-rm -f src/SCMPrint/$(am__dirstamp)
- -rm -f src/SEnumVal/$(DEPDIR)/$(am__dirstamp)
- -rm -f src/SEnumVal/$(am__dirstamp)
- -rm -f src/StdInParse/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/PSVIWriter/$(am__dirstamp)
-rm -f src/StdInParse/$(am__dirstamp)
+ -rm -f src/SAXCount/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/DOMCount/$(am__dirstamp)
+ -rm -f src/DOMPrint/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/SAXPrint/$(am__dirstamp)
+ -rm -f src/SAX2Count/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/CreateDOMDocument/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/MemParse/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/SAX2Count/$(am__dirstamp)
+ -rm -f src/DOMPrint/$(am__dirstamp)
+ -rm -f src/PSVIWriter/$(DEPDIR)/$(am__dirstamp)
+ -rm -f src/Redirect/$(am__dirstamp)
+ -rm -f src/EnumVal/$(am__dirstamp)
+ -rm -f src/SEnumVal/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
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=179393&r1=179392&r2=179393&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Wed Jun 1 11:18:35 2005
@@ -118,6 +118,13 @@
libcfurlna_la_SOURCES = ${cfurl_sources}
endif
+if XERCES_USE_NETACCESSOR_WINSOCK
+src_libraries += libwinsockna.la
+libwinsockna_ladir = ${includedir}
+nobase_libwinsockna_la_HEADERS = ${winsock_headers}
+libwinsockna_la_SOURCES = ${winsock_sources}
+endif
+
#
# Transcoders, conditionally built based on settings from configure
#
@@ -143,6 +150,13 @@
libmacosunicodeconverter_la_SOURCES = ${macosunicodeconverter_sources}
endif
+if XERCES_USE_TRANSCODER_WINDOWS
+src_libraries += libwintrans.la
+libwintrans_ladir = ${includedir}
+nobase_libwintrans_la_HEADERS = ${wintrans_headers}
+libwintrans_la_SOURCES = ${wintrans_sources}
+endif
+
#
# MsgLoaders, conditionally built based on settings from configure
#
@@ -177,6 +191,13 @@
libmacosaomgr_la_SOURCES = ${macosaomgr_sources}
endif
+if XERCES_USE_ATOMICOPMGR_WINDOWS
+src_libraries += libwinaomgr.la
+libwinaomgr_ladir = ${includedir}
+nobase_libwinaomgr_la_HEADERS = ${winaomgr_headers}
+libwinaomgr_la_SOURCES = ${winaomgr_sources}
+endif
+
#
# Mutex Managers, conditionally built based on settings from configure
#
@@ -194,6 +215,13 @@
libposixmmgr_la_SOURCES = ${posixmmgr_sources}
endif
+if XERCES_USE_MUTEXMGR_WINDOWS
+src_libraries += libwinmmgr.la
+libwinmmgr_ladir = ${includedir}
+nobase_libwinmmgr_la_HEADERS = ${winmmgr_headers}
+libwinmmgr_la_SOURCES = ${winmmgr_sources}
+endif
+
#
# File Managers, conditionally built based on settings from configure
#
@@ -204,6 +232,13 @@
libposixfmgr_la_SOURCES = ${posixfmgr_sources}
endif
+if XERCES_USE_FILEMGR_WINDOWS
+src_libraries += libwinfmgr.la
+libwinfmgr_ladir = ${includedir}
+nobase_libwinfmgr_la_HEADERS = ${winfmgr_headers}
+libwinfmgr_la_SOURCES = ${winfmgr_sources}
+endif
+
#
# Definition of sources/headers for each convenience library
#
@@ -992,6 +1027,12 @@
macosunicodeconverter_sources = \
xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
+wintrans_headers = \
+ xercesc/util/Transcoders/Win32/Win32TransService.hpp
+
+wintrans_sources = \
+ xercesc/util/Transcoders/Win32/Win32TransService.cpp
+
curl_headers = \
xercesc/util/NetAccessors/Curl/CurlNetAccessor.hpp \
@@ -1025,6 +1066,13 @@
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
inmemory_headers = \
xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp \
@@ -1040,6 +1088,12 @@
posixfmgr_sources = \
xercesc/util/FileManagers/PosixFileMgr.cpp
+winfmgr_headers = \
+ xercesc/util/FileManagers/WindowsFileMgr.hpp
+
+winfmgr_sources = \
+ xercesc/util/FileManagers/WindowsFileMgr.cpp
+
nothreadmmgr_headers = \
xercesc/util/MutexManagers/NoThreadMutexMgr.hpp
@@ -1053,6 +1107,12 @@
posixmmgr_sources = \
xercesc/util/MutexManagers/PosixMutexMgr.cpp
+winmmgr_headers = \
+ xercesc/util/MutexManagers/WindowsMutexMgr.hpp
+
+winmmgr_sources = \
+ xercesc/util/MutexManagers/WindowsMutexMgr.cpp
+
nothreadaomgr_headers = \
xercesc/util/AtomicOpManagers/NoThreadAtomicOpMgr.hpp
@@ -1072,6 +1132,12 @@
macosaomgr_sources = \
xercesc/util/AtomicOpManagers/MacOSAtomicOpMgr.cpp
+winaomgr_headers = \
+ xercesc/util/AtomicOpManagers/WindowsAtomicOpMgr.hpp
+
+winaomgr_sources = \
+ xercesc/util/AtomicOpManagers/WindowsAtomicOpMgr.cpp
+
macplatform_headers = \
xercesc/util/Platforms/MacOS/MacAbstractFile.hpp \
@@ -1087,7 +1153,8 @@
-
+DEFS += -DPROJ_XMLUTIL -DPROJ_XMLPARSER -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_PARSERS -DPROJ_VALIDATORS
+
#
# Override generated rules to provide prettier make rules
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org