You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2005/06/02 01:56:08 UTC
svn commit: r179466 [1/3] - in /xerces/c/branches/jberry/3.0-unstable:
Makefile.in config.h.in configure configure.ac lib/Makefile.in
obj/Makefile.in samples/Makefile.in src/Makefile.am src/Makefile.in
src/xercesc/util/XercesDefs.hpp
src/xercesc/util/Xerces_autoconf_config.hpp.in tests/Makefile.in
Author: jberry
Date: Wed Jun 1 16:56:05 2005
New Revision: 179466
URL: http://svn.apache.org/viewcvs?rev=179466&view=rev
Log:
Add some more changes to help building under windows with as both static and dll -- I hope.
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/config.h.in
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/configure.ac
xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.hpp.in
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=179466&r1=179465&r2=179466&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Wed Jun 1 16:56:05 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -33,6 +33,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -98,6 +99,8 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,6 +118,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -139,6 +143,7 @@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -195,9 +200,13 @@
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE@
XERCES_USE_TRANSCODER_WINDOWS_FALSE = @XERCES_USE_TRANSCODER_WINDOWS_FALSE@
XERCES_USE_TRANSCODER_WINDOWS_TRUE = @XERCES_USE_TRANSCODER_WINDOWS_TRUE@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
acx_pthread_config = @acx_pthread_config@
@@ -322,7 +331,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -334,7 +349,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -342,7 +357,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -363,7 +384,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
Modified: xerces/c/branches/jberry/3.0-unstable/config.h.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/config.h.in?rev=179466&r1=179465&r2=179466&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config.h.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/config.h.in Wed Jun 1 16:56:05 2005
@@ -302,18 +302,27 @@
/* Define to use the POSIX AtomicOp mgr */
#undef XERCES_USE_ATOMICOPMGR_POSIX
+/* Define to use the Windows AtomicOp mgr */
+#undef XERCES_USE_ATOMICOPMGR_WINDOWS
+
/* Define to use the POSIX file mgr */
#undef XERCES_USE_FILEMGR_POSIX
+/* Define to use the Windows file mgr */
+#undef XERCES_USE_FILEMGR_WINDOWS
+
/* Define to use the InMemory MsgLoader */
#undef XERCES_USE_MSGLOADER_INMEMORY
-/* Define to use the NoThread Mutex mgr */
+/* Define to use the NoThread mutex mgr */
#undef XERCES_USE_MUTEXMGR_NOTHREAD
/* Define to use the POSIX mutex mgr */
#undef XERCES_USE_MUTEXMGR_POSIX
+/* Define to use the Windows mutex mgr */
+#undef XERCES_USE_MUTEXMGR_WINDOWS
+
/* Define to use the Mac OS X CFURL NetAccessor */
#undef XERCES_USE_NETACCESSOR_CFURL
@@ -337,6 +346,9 @@
/* Define to use the Mac OS UnicodeConverter-based transcoder */
#undef XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER
+
+/* Define to use the Windows transcoder */
+#undef XERCES_USE_TRANSCODER_WINDOWS
/* Define to the 16 bit type used to represent Xerces UTF-16 characters */
#undef XERCES_XMLCH_T
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org