[rhmessaging-commits] rhmessaging commits: r1287 - store/trunk/cpp/tests/jrnl.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2007-11-12 11:43:01 -0500 (Mon, 12 Nov 2007)
New Revision: 1287

Modified:
   store/trunk/cpp/tests/jrnl/Makefile.am
Log:
Fixed Makefile.am so as not to cause a build when DISTEXTRAS are being handled

Modified: store/trunk/cpp/tests/jrnl/Makefile.am
===================================================================
--- store/trunk/cpp/tests/jrnl/Makefile.am	2007-11-12 16:31:20 UTC (rev 1286)
+++ store/trunk/cpp/tests/jrnl/Makefile.am	2007-11-12 16:43:01 UTC (rev 1287)
@@ -41,20 +41,13 @@
   unit_test_jinf
 
 unit_test_jexception_SOURCES = unit_test_jexception.cpp
-unit_test_jexception_LDADD = ../../lib/.libs/jexception.o ../../lib/.libs/jerrno.o
-unit_test_jexception_LDFLAGS = -lboost_unit_test_framework
+unit_test_jexception_LDFLAGS = -lboost_unit_test_framework -lbdbstore -L../../lib/.libs
 
 unit_test_jerrno_SOURCES = unit_test_jerrno.cpp
-unit_test_jerrno_LDADD = ../../lib/.libs/jerrno.o
-unit_test_jerrno_LDFLAGS = -lboost_unit_test_framework
+unit_test_jerrno_LDFLAGS = -lboost_unit_test_framework -lbdbstore -L../../lib/.libs
 
 unit_test_jinf_SOURCES = unit_test_jinf.cpp
-unit_test_jinf_LDADD = \
-  ../../lib/.libs/jinf.o \
-  ../../lib/.libs/file_hdr.o \
-  ../../lib/.libs/jexception.o \
-  ../../lib/.libs/jerrno.o
-unit_test_jinf_LDFLAGS = -lboost_unit_test_framework -lrt
+unit_test_jinf_LDFLAGS = -lboost_unit_test_framework -lbdbstore -lrt -L../../lib/.libs
 
 JournalSystemTests_la_SOURCES = \
   JournalSystemTests.cpp   \
@@ -65,4 +58,11 @@
 libdlclose_noop_la_SOURCES = ../dlclose_noop.c
 libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
 
-EXTRA_DIST = $(TESTS) rtest janalyze.py tests.ods rtests.csv rwtests.csv wtests.csv
+EXTRA_DIST = \
+  run-journal-tests \
+  rtest \
+  janalyze.py \
+  tests.ods \
+  rtests.csv \
+  rwtests.csv \
+  wtests.csv