qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r527712 - in /incubator/qpid/trunk/qpid/cpp: configure.ac src/Makefile.am src/tests/Makefile.am
Date Wed, 11 Apr 2007 22:32:32 GMT
Author: aconway
Date: Wed Apr 11 15:32:30 2007
New Revision: 527712

URL: http://svn.apache.org/viewvc?view=rev&rev=527712
Log:
* cpp/configure.ac: Disable static libraries by default. Half the build time!
* cpp/src/Makefile.am (maintainer-clean): added missing maintainer-clean 
* cpp/src/tests/Makefile.am (check): remove un-necessary dependencies that
  were causing trouble with parallel builds.

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=527712&r1=527711&r2=527712
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Apr 11 15:32:30 2007
@@ -72,6 +72,7 @@
   COMPILER_FLAGS=
 fi
 
+AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_SUBST([LIBTOOL_DEPS])
 
@@ -100,35 +101,26 @@
 AC_SUBST(CPPUNIT_LIBS)
 AC_SUBST(CPPUNIT_CXXFLAGS)
 
-AC_ARG_ENABLE(apr,
-[  --enable-apr   use the Apache Portable Runtime library (default)
-   --disable-apr  do not use the Apache Portable Runtime library],
-[case $enableval in
-   yes|no) ;;
-   *)      AC_MSG_ERROR([invalid APR enable/disable value: $enableval]) ;;
-  esac],
-[enableval=yes])
-
+# Removed --enable-apr option as we currently don't build without APR.
+  
 APR_MINIMUM_VERSION=1.2.2
 AC_SUBST(APR_MINIMUM_VERSION)
 AC_SUBST(APR_CXXFLAGS)
 AC_SUBST(USE_APR)
 
-if test "$enableval" = yes; then
-  PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
-  APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
-  USE_APR=1
-fi
-
-AC_ARG_ENABLE(valgrind,
-  [  --enable-valgrind   enable testing via valgrind, if available (recommended)
-     --disable-valgrind  do not use valgrind],
+PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
+APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
+USE_APR=1
+
+AC_ARG_ENABLE([valgrind],
+  [AS_HELP_STRING([--enable-valgrind],
+    [run valgrind memory checker on tests, if available (default yes)])],
   [case $enableval in
-     yes|no) enable_VALGRIND=$enableval;;
-     *) AC_MSG_ERROR([invalid valgrind enable/disable value: $enableval]);;
-    esac],
-  [enable_VALGRIND=yes]  # no option given, default
-  )
+    yes|no) enable_VALGRIND=$enableval;;
+    *) AC_MSG_ERROR([Invalid value for --enable-valgrind: $enableval]);;
+   esac],
+  [enable_VALGRIND=yes]
+)
 
 # We use valgrind for the tests.  See if it's available.
 # Check for it unconditionally, so we don't have to duplicate its

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=527712&r1=527711&r2=527712
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Apr 11 15:32:30 2007
@@ -312,5 +312,9 @@
 	mv $@-t $@
 endif
 
+maintainer-clean:
+	rm -f  $(gentools_srcdir)/*.class
+	rm -f $(BUILT_SOURCES)
+
 # Force build during dist phase so help2man will work.
 dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=527712&r1=527711&r2=527712
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Apr 11 15:32:30 2007
@@ -111,13 +111,12 @@
 	> $@-t
 	mv $@-t $@
 
-check: .valgrindrc $(check_LTLIBRARIES) \
-  $(lib_common) $(lib_client) $(lib_broker) ../qpidd
+check: .valgrindrc ../qpidd
 
 check-unit:
 	$(MAKE) check TESTS=run-unit-tests
 
-# Create a copy so user can modify without risk of checking in their mods.
+# Create a copy so that can be modified without risk of committing the changes.
 .valgrindrc: .valgrindrc-default
 	cp $(srcdir)/.valgrindrc-default .valgrindrc
 



Mime
View raw message