Author: jberry
Date: Sat May 28 09:58:11 2005
New Revision: 178873
URL: http://svn.apache.org/viewcvs?rev=178873&view=rev
Log:
Add default support for prettier make output, inspired by Axel Weis.
- New configure option --enable-pretty-make=yes or --disable-pretty-make
will turn it on or off at configure time.
- If it's been configured on, you may temporarilly override it at run
time with "make VERBOSE=1". This is almost the same as the default, though
a is a bit more quiet.
Added:
xerces/c/branches/jberry/3.0-unstable/config/pretty-make (with props)
xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4 (with
props)
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.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/m4/xerces_netaccessor_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
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/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=178873&r1=178872&r2=178873&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Sat May 28 09:58:11 2005
@@ -59,6 +59,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -154,6 +155,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
Added: xerces/c/branches/jberry/3.0-unstable/config/pretty-make
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/config/pretty-make?rev=178873&view=auto
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/config/pretty-make (added)
+++ xerces/c/branches/jberry/3.0-unstable/config/pretty-make Sat May 28
09:58:11 2005
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Copyright 2005 The Apache Software Foundation.
+#
+# Licensed 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# pretty-make
+#
+# This script helps in pretty-printing of build commands.
+# We invoke it via overridden rules in Makefile.am
+#
+# $Id$
+#
+
+action=$1
+shift
+
+args=("$@")
+target=${args[$#-1]}
+
+echo $action $target
+
+if [ ${VERBOSE} ]; then
+ echo $@
+fi
+$@
+
+
Propchange: xerces/c/branches/jberry/3.0-unstable/config/pretty-make
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/c/branches/jberry/3.0-unstable/config/pretty-make
------------------------------------------------------------------------------
svn:executable = *
Propchange: xerces/c/branches/jberry/3.0-unstable/config/pretty-make
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178873&r1=178872&r2=178873&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Sat May 28 09:58:11 2005
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS
CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP
ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LIBOBJS CURL_PREFIX
LIBWWW_PREFIX XERCES_USE_NETACCESSOR_CURL_TRUE
XERCES_USE_NETACCESSOR_CURL_FALSE XERCES_USE_NETACCESSOR_CFURL_TRUE
XERCES_USE_NETACCESSOR_CFURL_FALSE XERCES_USE_NETACCESSOR_WINSOCK_TRUE
XERCES_USE_NETACCESSOR_WINSOCK_FALSE XERCES_USE_NETACCESSOR_SOCKET_TRUE
XERCES_USE_NETACCESSOR_SOCKET_FALSE XERCES_USE_NETACCESSOR_LIBWWW_TRUE
XERCES_USE_NETACCESSOR_LIBWWW_FALSE ICU_PREFIX XERCES_USE_TRANSCODER_ICU_TRUE
XERCES_USE_TRANSCODER_ICU_FALSE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE
XERCES_USE_TRANSCODER_ICONV_TRUE XERCES_USE_TRANSCODER_ICONV_FALSE
XERCES_USE_MSGLOADER_INMEMORY_TRUE XERCES_USE_MSGLOADER_INMEMORY_FALSE
XERCES_USE_FILEMGR_POSIX_TRUE XERCES_USE_FILEMGR_POSIX_FALSE
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE XERCES_USE_MUTEXMGR_NOTHREAD_FALSE
XERCES_USE_MUTEXMGR_POSIX_TRUE XERCES_USE_MUTEXMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE
XERCES_USE_ATOMICOPMGR_POSIX_TRUE XERCES_USE_ATOMICOPMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_MACOS_TRUE XERCES_USE_ATOMICOPMGR_MACOS_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar
am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS
CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP
ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS LIBOBJS
XERCES_PRETTY_MAKE_TRUE XERCES_PRETTY_MAKE_FALSE CURL_PREFIX LIBWWW_PREFIX
XERCES_USE_NETACCESSOR_CURL_TRUE XERCES_USE_NETACCESSOR_CURL_FALSE
XERCES_USE_NETACCESSOR_CFURL_TRUE XERCES_USE_NETACCESSOR_CFURL_FALSE
XERCES_USE_NETACCESSOR_WINSOCK_TRUE XERCES_USE_NETACCESSOR_WINSOCK_FALSE
XERCES_USE_NETACCESSOR_SOCKET_TRUE XERCES_USE_NETACCESSOR_SOCKET_FALSE
XERCES_USE_NETACCESSOR_LIBWWW_TRUE XERCES_USE_NETACCESSOR_LIBWWW_FALSE
ICU_PREFIX XERCES_USE_TRANSCODER_ICU_TRUE XERCES_USE_TRANSCODER_ICU_FALSE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_TRUE
XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE
XERCES_USE_TRANSCODER_ICONV_TRUE XERCES_USE_TRANSCODER_ICONV_FALSE
XERCES_USE_MSGLOADER_INMEMORY_TRUE XERCES_USE_MSGLOADER_INMEMORY_FALSE
XERCES_USE_FILEMGR_POSIX_TRUE XERCES_USE_FILEMGR_POSIX_FALSE
XERCES_USE_MUTEXMGR_NOTHREAD_TRUE XERCES_USE_MUTEXMGR_NOTHREAD_FALSE
XERCES_USE_MUTEXMGR_POSIX_TRUE XERCES_USE_MUTEXMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_NOTHREAD_TRUE XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE
XERCES_USE_ATOMICOPMGR_POSIX_TRUE XERCES_USE_ATOMICOPMGR_POSIX_FALSE
XERCES_USE_ATOMICOPMGR_MACOS_TRUE XERCES_USE_ATOMICOPMGR_MACOS_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1037,6 +1037,7 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --pretty-make Enable prettier make output
--enable-netaccessor-curl
Enable libcurl-based NetAccessor support
--enable-netaccessor-libwww
@@ -4270,7 +4271,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4273 "configure"' > conftest.$ac_ext
+ echo '#line 4274 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5385,7 +5386,7 @@
# Provide some information about the compiler.
-echo "$as_me:5388:" \
+echo "$as_me:5389:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6454,11 +6455,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6457: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6458: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6461: \$? = $ac_status" >&5
+ echo "$as_me:6462: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6709,11 +6710,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6712: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6713: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6716: \$? = $ac_status" >&5
+ echo "$as_me:6717: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6769,11 +6770,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6772: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6773: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6776: \$? = $ac_status" >&5
+ echo "$as_me:6777: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8969,7 +8970,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8972 "configure"
+#line 8973 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9067,7 +9068,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9070 "configure"
+#line 9071 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11287,11 +11288,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11290: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11291: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11294: \$? = $ac_status" >&5
+ echo "$as_me:11295: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11347,11 +11348,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11350: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11351: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11354: \$? = $ac_status" >&5
+ echo "$as_me:11355: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12710,7 +12711,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12713 "configure"
+#line 12714 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12808,7 +12809,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12811 "configure"
+#line 12812 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13663,11 +13664,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13666: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13670: \$? = $ac_status" >&5
+ echo "$as_me:13671: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13723,11 +13724,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13726: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13727: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13730: \$? = $ac_status" >&5
+ echo "$as_me:13731: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15779,11 +15780,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15782: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15783: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15786: \$? = $ac_status" >&5
+ echo "$as_me:15787: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16034,11 +16035,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16037: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16038: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16041: \$? = $ac_status" >&5
+ echo "$as_me:16042: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16094,11 +16095,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16097: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16098: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16101: \$? = $ac_status" >&5
+ echo "$as_me:16102: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18294,7 +18295,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18297 "configure"
+#line 18298 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18392,7 +18393,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18395 "configure"
+#line 18396 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24051,6 +24052,40 @@
######################################################
+ echo "$as_me:$LINENO: checking for whether we we'll do a pretty make"
>&5
+echo $ECHO_N "checking for whether we we'll do a pretty make... $ECHO_C" >&6
+ # Check whether --enable-pretty-make or --disable-pretty-make was given.
+if test "${enable_pretty_make+set}" = set; then
+ enableval="$enable_pretty_make"
+ if test x"$enableval" = xyes; then
+ xerces_pretty_make=yes
+else
+ xerces_pretty_make=no
+fi
+
+else
+ xerces_pretty_make=yes
+fi;
+ echo "$as_me:$LINENO: result: $xerces_pretty_make" >&5
+echo "${ECHO_T}$xerces_pretty_make" >&6
+
+ # 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.
+
+
+if test x"$xerces_pretty_make" = xyes; then
+ XERCES_PRETTY_MAKE_TRUE=
+ XERCES_PRETTY_MAKE_FALSE='#'
+else
+ XERCES_PRETTY_MAKE_TRUE='#'
+ XERCES_PRETTY_MAKE_FALSE=
+fi
+
+
+
+
+
+
# Check whether --with-curl or --without-curl was given.
if test "${with_curl+set}" = set; then
@@ -24221,11 +24256,11 @@
- echo "$as_me:$LINENO: checking for whether we can support the CFURL
NetAccessor (Mac OS X)" >&5
-echo $ECHO_N "checking for whether we can support the CFURL NetAccessor (Mac
OS X)... $ECHO_C" >&6
list_add=
case $host_os in
darwin*)
+ echo "$as_me:$LINENO: checking for whether we can support the
CFURL NetAccessor (Mac OS X)" >&5
+echo $ECHO_N "checking for whether we can support the CFURL NetAccessor (Mac
OS X)... $ECHO_C" >&6
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
# Check whether --enable-netaccessor-cfurl or
--disable-netaccessor-cfurl was given.
@@ -24804,11 +24839,11 @@
# Check for MacOSUnicodeConverter
- echo "$as_me:$LINENO: checking for whether we can support the
MacOSUnicodeConverter Transcoder" >&5
-echo $ECHO_N "checking for whether we can support the MacOSUnicodeConverter
Transcoder... $ECHO_C" >&6
list_add=
case $host_os in
darwin*)
+ echo "$as_me:$LINENO: checking for whether we can support the
MacOSUnicodeConverter Transcoder" >&5
+echo $ECHO_N "checking for whether we can support the MacOSUnicodeConverter
Transcoder... $ECHO_C" >&6
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
# Check whether --enable-transcoder-macosunicodeconverter or
--disable-transcoder-macosunicodeconverter was given.
if test "${enable_transcoder_macosunicodeconverter+set}" = set; then
@@ -25568,6 +25603,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XERCES_PRETTY_MAKE_TRUE}" && test -z
"${XERCES_PRETTY_MAKE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XERCES_PRETTY_MAKE\" was
never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XERCES_PRETTY_MAKE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${XERCES_USE_NETACCESSOR_CURL_TRUE}" && test -z
"${XERCES_USE_NETACCESSOR_CURL_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"XERCES_USE_NETACCESSOR_CURL\"
was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -26284,6 +26326,8 @@
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
+s,@XERCES_PRETTY_MAKE_TRUE@,$XERCES_PRETTY_MAKE_TRUE,;t t
+s,@XERCES_PRETTY_MAKE_FALSE@,$XERCES_PRETTY_MAKE_FALSE,;t t
s,@CURL_PREFIX@,$CURL_PREFIX,;t t
s,@LIBWWW_PREFIX@,$LIBWWW_PREFIX,;t t
s,@XERCES_USE_NETACCESSOR_CURL_TRUE@,$XERCES_USE_NETACCESSOR_CURL_TRUE,;t t
Modified: xerces/c/branches/jberry/3.0-unstable/configure.ac
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure.ac?rev=178873&r1=178872&r2=178873&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure.ac (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure.ac Sat May 28 09:58:11 2005
@@ -138,6 +138,8 @@
# Look for availability of available packages
######################################################
+XERCES_PRETTY_MAKE
+
XERCES_CURL_PREFIX
XERCES_LIBWWW_PREFIX
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=178873&r1=178872&r2=178873&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Sat May 28 09:58:11
2005
@@ -78,6 +78,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -171,6 +172,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
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=178873&r1=178872&r2=178873&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
Sat May 28 09:58:11 2005
@@ -69,10 +69,10 @@
)
- AC_MSG_CHECKING([for whether we can support the CFURL NetAccessor (Mac
OS X)])
list_add=
case $host_os in
darwin*)
+ AC_MSG_CHECKING([for whether we can support the CFURL
NetAccessor (Mac OS X)])
AS_IF([test x"$ac_cv_header_CoreServices_CoreServices_h" =
xyes], [
AC_ARG_ENABLE([netaccessor-cfurl],
AS_HELP_STRING([--enable-netaccessor-cfurl],
Added: xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4?rev=178873&view=auto
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4 (added)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4 Sat May 28
09:58:11 2005
@@ -0,0 +1,30 @@
+dnl @synopsis XERCES_PRETTY_MAKE
+dnl
+dnl Determines the whether we're doing a pretty make
+dnl --enable-pretty-make=yes is the default
+dnl
+dnl @category Xerces
+dnl @author Axel Weiss and James Berry
+dnl @version 2005-05-27
+dnl @license AllPermissive
+dnl
+dnl $Id$
+
+AC_DEFUN([XERCES_PRETTY_MAKE],
+ [
+ AC_MSG_CHECKING([for whether we we'll do a pretty make])
+ AC_ARG_ENABLE([pretty-make],
+ AS_HELP_STRING([--pretty-make],
+ [Enable prettier make output]),
+ [AS_IF([test x"$enableval" = xyes],
+ [xerces_pretty_make=yes],
+ [xerces_pretty_make=no])],
+ [xerces_pretty_make=yes])
+ AC_MSG_RESULT([$xerces_pretty_make])
+
+ # 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_PRETTY_MAKE], [test x"$xerces_pretty_make" =
xyes])
+
+ ]
+)
Propchange: xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/c/branches/jberry/3.0-unstable/m4/xerces_pretty_make.m4
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=178873&r1=178872&r2=178873&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 Sat
May 28 09:58:11 2005
@@ -59,10 +59,10 @@
# Check for MacOSUnicodeConverter
- AC_MSG_CHECKING([for whether we can support the MacOSUnicodeConverter
Transcoder])
list_add=
case $host_os in
darwin*)
+ AC_MSG_CHECKING([for whether we can support the
MacOSUnicodeConverter Transcoder])
if test x"$ac_cv_header_CoreServices_CoreServices_h" = xyes;
then
AC_ARG_ENABLE([transcoder-macosunicodeconverter],
AS_HELP_STRING([--enable-transcoder-macosunicodeconverter],
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=178873&r1=178872&r2=178873&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Sat May 28 09:58:11
2005
@@ -77,6 +77,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -177,6 +178,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
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=178873&r1=178872&r2=178873&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
09:58:11 2005
@@ -18,6 +18,27 @@
# $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
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=178873&r1=178872&r2=178873&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
09:58:11 2005
@@ -60,8 +60,7 @@
host_triplet = @host@
noinst_PROGRAMS = $(am__EXEEXT_1)
subdir = samples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \
- config.sub install-sh
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/cxx_have_bool.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -175,11 +175,6 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -260,6 +255,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
@@ -334,6 +331,17 @@
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 \
@@ -915,6 +923,14 @@
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-info-am
+
+#
+# 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
+#
[EMAIL PROTECTED]@.SILENT:
# 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=178873&r1=178872&r2=178873&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 09:58:11
2005
@@ -20,6 +20,27 @@
#
+# 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
#
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=178873&r1=178872&r2=178873&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 09:58:11
2005
@@ -134,6 +134,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -575,11 +576,6 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -773,6 +769,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
@@ -847,6 +845,17 @@
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
@@ -4530,6 +4539,14 @@
uninstall-nobase_libvalidators_laHEADERS \
uninstall-nobase_libwww_laHEADERS
+
+#
+# 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
+#
[EMAIL PROTECTED]@.SILENT:
# 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=178873&r1=178872&r2=178873&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 09:58:11
2005
@@ -18,6 +18,26 @@
# $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}
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=178873&r1=178872&r2=178873&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 09:58:11
2005
@@ -77,6 +77,7 @@
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
$(top_srcdir)/m4/xerces_no_threads.m4 \
+ $(top_srcdir)/m4/xerces_pretty_make.m4 \
$(top_srcdir)/m4/xerces_transcoder_selection.m4 \
$(top_srcdir)/m4/xerces_type_16bit_int.m4 \
$(top_srcdir)/m4/xerces_type_32bit_int.m4 \
@@ -137,11 +138,6 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -228,6 +224,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XERCES_PRETTY_MAKE_FALSE = @XERCES_PRETTY_MAKE_FALSE@
+XERCES_PRETTY_MAKE_TRUE = @XERCES_PRETTY_MAKE_TRUE@
XERCES_USE_ATOMICOPMGR_MACOS_FALSE = @XERCES_USE_ATOMICOPMGR_MACOS_FALSE@
XERCES_USE_ATOMICOPMGR_MACOS_TRUE = @XERCES_USE_ATOMICOPMGR_MACOS_TRUE@
XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE = @XERCES_USE_ATOMICOPMGR_NOTHREAD_FALSE@
@@ -302,6 +300,17 @@
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
@@ -794,6 +803,14 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am
+
+#
+# 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
+#
[EMAIL PROTECTED]@.SILENT:
# 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]
