[rhmessaging-commits] rhmessaging commits: r3531 - in store/trunk/cpp: tests and 1 other directory.

Author: astitcher Date: 2009-07-30 16:43:43 -0400 (Thu, 30 Jul 2009) New Revision: 3531 Modified: store/trunk/cpp/bootstrap store/trunk/cpp/tests/Makefile.am Log: Remove pointless generated makefile fragment Modified: store/trunk/cpp/bootstrap =================================================================== --- store/trunk/cpp/bootstrap 2009-07-30 20:43:35 UTC (rev 3530) +++ store/trunk/cpp/bootstrap 2009-07-30 20:43:43 UTC (rev 3531) @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007, 2008 Red Hat Inc. +# Copyright (C) 2007, 2008, 2009 Red Hat Inc. # # This file is part of the Qpid async store library msgstore.so. # @@ -25,11 +25,5 @@ aclocal -I m4 autoheader libtoolize --automake - -# Generate (for automake) lots of repetitive parts of tests/Makefile.am. -(cd tests && rm -f gen.mk - perl -ne '/^include / or print' Makefile.am \ - | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) - automake --add-missing autoconf Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:35 UTC (rev 3530) +++ store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:43 UTC (rev 3531) @@ -56,19 +56,18 @@ UNIT_TEST_SRCS = unit_test.cpp unit_test.h UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/msgstore.la -include gen.mk +SimpleTest_SOURCES = SimpleTest.cpp $(UNIT_TEST_SRCS) +SimpleTest_LDADD = $(UNIT_TEST_LDADD) -lrt -gen.mk: Makefile.am - ( \ - for i in $(check_PROGRAMS); do \ - echo $${i}_SOURCES = $$i.cpp '$$(UNIT_TEST_SRCS)'; \ - echo $${i}_LDADD = '$$(UNIT_TEST_LDADD)' -lrt; \ - echo ; \ - done; \ - ) \ - > $@-t - mv $@-t $@ +OrderingTest_SOURCES = OrderingTest.cpp $(UNIT_TEST_SRCS) +OrderingTest_LDADD = $(UNIT_TEST_LDADD) -lrt +TransactionalTest_SOURCES = TransactionalTest.cpp $(UNIT_TEST_SRCS) +TransactionalTest_LDADD = $(UNIT_TEST_LDADD) -lrt + +TwoPhaseCommitTest_SOURCES = TwoPhaseCommitTest.cpp $(UNIT_TEST_SRCS) +TwoPhaseCommitTest_LDADD = $(UNIT_TEST_LDADD) -lrt + EXTRA_DIST = \ clean.sh \ failing_python_tests.txt \