Author: jberry
Date: Sat May 28 11:24:55 2005
New Revision: 178874
URL: http://svn.apache.org/viewcvs?rev=178874&view=rev
Log:
Don't rely on global .SILENT to keep make quiet. Override default rules to shut
them up, and give .SILENT particular targets to shut up...it doesn't want to do
the same for default rules
Modified:
xerces/c/branches/jberry/3.0-unstable/samples/Makefile.am
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/tests/Makefile.am
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/samples/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/samples/Makefile.am?rev=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/Makefile.am Sat May 28
11:24:55 2005
@@ -18,27 +18,6 @@
# $Id$
#
-#
-# Override generated rules to provide prettier make rules
-#
-# Warning: If Automake changes sufficiently, these rules may need to
-# be regenerated from the (new) default output of Automake
-#
-if XERCES_PRETTY_MAKE
-.SILENT:
-PRETTY_MAKE=${top_srcdir}/config/pretty-make
-PRETTY_COMPILE=${PRETTY_MAKE} Compiling
-endif
-
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-
noinst_PROGRAMS = ${sampleprogs}
LDADD =
../obj/libxerces.la
@@ -104,3 +83,50 @@
sampleprogs += StdInParse
StdInParse_SOURCES = src/StdInParse/StdInParse.cpp \
src/StdInParse/StdInParseHandlers.cpp
+
+
+#
+# Override generated rules to provide prettier make rules
+#
+# Warning: If Automake changes sufficiently, these rules may need to
+# be regenerated from the (new) default output of Automake
+#
+if XERCES_PRETTY_MAKE
+.cpp.o:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -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) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(LTCXXCOMPILE) -c -o $@ $<
+
+PRETTY_MAKE=${top_srcdir}/config/pretty-make
+PRETTY_COMPILE=${PRETTY_MAKE} Compiling
+endif
+
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+
+
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=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in Sat May 28
11:24:55 2005
@@ -331,17 +331,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
LDADD = ../obj/libxerces.la
AM_CPPFLAGS = -I${top_srcdir}/src
sampleprogs = CreateDOMDocument DOMCount DOMPrint EnumVal MemParse \
@@ -386,6 +375,17 @@
StdInParse_SOURCES = src/StdInParse/StdInParse.cpp \
src/StdInParse/StdInParseHandlers.cpp
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
all: all-am
.SUFFIXES:
@@ -693,7 +693,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/StdInParse/$(DEPDIR)/[EMAIL
PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/StdInParse/$(DEPDIR)/[EMAIL
PROTECTED]@
-.cpp.o:
[EMAIL PROTECTED]@.cpp.o:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -701,7 +701,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-.cpp.obj:
[EMAIL PROTECTED]@.cpp.obj:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -709,7 +709,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cpp.lo:
[EMAIL PROTECTED]@.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 $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -930,7 +930,29 @@
# Warning: If Automake changes sufficiently, these rules may need to
# be regenerated from the (new) default output of Automake
#
[EMAIL PROTECTED]@.SILENT:
[EMAIL PROTECTED]@.cpp.o:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(CXXCOMPILE) -c -o $@ $<
+
[EMAIL PROTECTED]@.cpp.obj:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(CXXCOMPILE) -c -o $@
`$(CYGPATH_W) '$<'`
+
[EMAIL PROTECTED]@.cpp.lo:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(LTCXXCOMPILE) -c -o $@ $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
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=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Sat May 28 11:24:55
2005
@@ -20,27 +20,6 @@
#
-# Override generated rules to provide prettier make rules
-#
-# Warning: If Automake changes sufficiently, these rules may need to
-# be regenerated from the (new) default output of Automake
-#
-if XERCES_PRETTY_MAKE
-.SILENT:
-PRETTY_MAKE=${top_srcdir}/config/pretty-make
-PRETTY_COMPILE=${PRETTY_MAKE} Compiling
-endif
-
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-
-#
# Specify the convenience libraries for various xerces components
# These are used only during the build process and are not themselves installed
#
@@ -1085,3 +1064,43 @@
xercesc/util/Platforms/MacOS/MacCarbonFile.cpp \
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
+# be regenerated from the (new) default output of Automake
+#
+if XERCES_PRETTY_MAKE
+
+.SILENT: \
+
xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo \
+
xercesc/util/NetAccessors/LibWWW/libwww_la-LibWWWNetAccessor.lo \
+
xercesc/util/NetAccessors/LibWWW/libwww_la-BinURLInputStream.lo
+
+.cpp.lo:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -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) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(LTCXXCOMPILE) -c -o $@ $<
+
+PRETTY_MAKE=${top_srcdir}/config/pretty-make
+PRETTY_COMPILE=${PRETTY_MAKE} Compiling
+
+endif
+
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+
+
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=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Sat May 28 11:24:55
2005
@@ -845,17 +845,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
#
# Specify the convenience libraries for various xerces components
@@ -1804,6 +1793,17 @@
xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp \
xercesc/util/Platforms/MacOS/MacPosixFile.cpp
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
all: all-am
.SUFFIXES:
@@ -3752,7 +3752,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cpp.lo:
[EMAIL PROTECTED]@.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 $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -4546,7 +4546,19 @@
# Warning: If Automake changes sufficiently, these rules may need to
# be regenerated from the (new) default output of Automake
#
[EMAIL PROTECTED]@.SILENT:
+
[EMAIL PROTECTED]@.SILENT: \
[EMAIL PROTECTED]@
xercesc/util/Transcoders/ICU/libicu_la-ICUTransService.lo \
[EMAIL PROTECTED]@
xercesc/util/NetAccessors/LibWWW/libwww_la-LibWWWNetAccessor.lo \
[EMAIL PROTECTED]@
xercesc/util/NetAccessors/LibWWW/libwww_la-BinURLInputStream.lo
+
[EMAIL PROTECTED]@.cpp.lo:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(LTCXXCOMPILE) -c -o $@ $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.am?rev=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.am Sat May 28 11:24:55
2005
@@ -18,27 +18,6 @@
# $Id: DOM.hpp,v 1.12 2004/09/08 13:55:38 peiyongz Exp $
#
-#
-# Override generated rules to provide prettier make rules
-#
-# Warning: If Automake changes sufficiently, these rules may need to
-# be regenerated from the (new) default output of Automake
-#
-if XERCES_PRETTY_MAKE
-.SILENT:
-PRETTY_MAKE=${top_srcdir}/config/pretty-make
-PRETTY_COMPILE=${PRETTY_MAKE} Compiling
-endif
-
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-
check_PROGRAMS = ${testprogs}
LDADD =
../obj/libxerces.la
@@ -133,5 +112,49 @@
testprogs += XSValueTest
XSValueTest_SOURCES = src/XSValueTest/XSValueTest.cpp
\
src/XSValueTest/XSValueTest.hpp
+
+#
+# Override generated rules to provide prettier make rules
+#
+# Warning: If Automake changes sufficiently, these rules may need to
+# be regenerated from the (new) default output of Automake
+#
+if XERCES_PRETTY_MAKE
+.cpp.o:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @source='$<' object='$@'
libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
[EMAIL PROTECTED]@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -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) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ @$(LTCXXCOMPILE) -c -o $@ $<
+
+PRETTY_MAKE=${top_srcdir}/config/pretty-make
+PRETTY_COMPILE=${PRETTY_MAKE} Compiling
+endif
+
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in?rev=178874&r1=178873&r2=178874&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Sat May 28 11:24:55
2005
@@ -300,17 +300,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
LDADD = ../obj/libxerces.la
AM_CPPFLAGS = -I${top_srcdir}/src
@@ -391,6 +380,17 @@
XSValueTest_SOURCES = src/XSValueTest/XSValueTest.cpp \
src/XSValueTest/XSValueTest.hpp
[EMAIL PROTECTED]@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
[EMAIL PROTECTED]@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
all: all-am
.SUFFIXES:
@@ -582,7 +582,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/XSerializerTest/$(DEPDIR)/[EMAIL
PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/XSerializerTest/$(DEPDIR)/[EMAIL
PROTECTED]@
-.cpp.o:
[EMAIL PROTECTED]@.cpp.o:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -590,7 +590,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-.cpp.obj:
[EMAIL PROTECTED]@.cpp.obj:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -598,7 +598,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cpp.lo:
[EMAIL PROTECTED]@.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 $@ $<; \
@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f
"$$depbase.Tpo"; exit 1; fi
@@ -810,7 +810,29 @@
# Warning: If Automake changes sufficiently, these rules may need to
# be regenerated from the (new) default output of Automake
#
[EMAIL PROTECTED]@.SILENT:
[EMAIL PROTECTED]@.cpp.o:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(CXXCOMPILE) -c -o $@ $<
+
[EMAIL PROTECTED]@.cpp.obj:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(CXXCOMPILE) -c -o $@
`$(CYGPATH_W) '$<'`
+
[EMAIL PROTECTED]@.cpp.lo:
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo"
"$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<'
object='$@' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @DEPDIR=$(DEPDIR)
$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ @$(LTCXXCOMPILE) -c -o $@ $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
