Changeset afbb6c0 for molecuilder

Timestamp:

Oct 7, 2009, 3:35:17 PM (16 years ago)

Author:

metzler <metzler@…>

Children:

682229

Parents:

53f32e

Message:

Ticket 30: Put molecuilder unit tests in their own subfolder in src

Location:

molecuilder

Files:

• Makefile.am (modified) (1 diff, 1 prop)
• configure.ac (modified) (1 diff, 1 prop)
• src/Makefile.am (modified) (1 diff, 1 prop)
• src/unittests/Makefile.am (modified) (1 diff)

molecuilder/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src doc tests
+SUBDIRS = src src/unittests doc tests 
 
 EXTRA_DIST = autogen.sh

molecuilder/configure.ac

@@ -14 +14 @@
 AC_PROG_CXX
 AC_PROG_CC
+AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_PROG([LATEX],[latex],[latex],[:])

molecuilder/src/Makefile.am

@@ -1 @@
-SUBDIRS = unittests
+SOURCE = atom.cpp bond.cpp boundary.cpp config.cpp          element.cpp ellipsoid.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp memoryusageobserver.cpp molecules.cpp moleculelist.cpp parser.cpp periodentafel.cpp                tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
+HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp memoryusageobserver.hpp molecules.hpp                  parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
 
-SOURCE = atom.cpp bond.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp moleculelist.cpp molecules.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
-HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
+INCLUDES = -I$(top_srcdir)/src/unittests
 
+noinst_LIBRARIES = libmolecuilder.a
 bin_PROGRAMS = molecuilder joiner analyzer
 molecuilderdir = ${bindir}
+libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
 molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
-molecuilder_SOURCES =  ${SOURCE} builder.cpp  ${HEADER}
-joiner_SOURCES = joiner.cpp datacreator.cpp element.cpp helpers.cpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp periodentafel.cpp parser.cpp verbose.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp 
-analyzer_SOURCES = analyzer.cpp datacreator.cpp element.cpp helpers.cpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp periodentafel.cpp parser.cpp verbose.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
+molecuilder_SOURCES = builder.cpp
+molecuilder_LDADD = libmolecuilder.a
+joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
+joiner_LDADD = libmolecuilder.a 
+analyzer_SOURCES = analyzer.cpp datacreator.cpp parser.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
+analyzer_LDADD = libmolecuilder.a 
 
-EXTRA_DIST = ${molecuilder_DATA}
+#EXTRA_DIST = ${molecuilder_DATA}

molecuilder/src/unittests/Makefile.am

@@ +1 @@
+INCLUDES = -I$(top_srcdir)/src
+
 noinst_PROGRAMS =  MemoryAllocatorUnitTest MemoryUsageObserverUnitTest VectorUnitTest
 
 TESTS = VectorUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest 
 check_PROGRAMS = $(TESTS)
+
 VectorUnitTest_SOURCES = defs.hpp helpers.hpp leastsquaremin.hpp memoryallocator.hpp memoryusageobserver.hpp vectorunittest.cpp vectorunittest.hpp vector.hpp verbose.hpp 
 VectorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 VectorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
+VectorUnitTest_LDADD = ../libmolecuilder.a
 
 MemoryAllocatorUnitTest_SOURCES = defs.hpp helpers.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp memoryallocator.hpp memoryusageobserver.hpp verbose.hpp 
 MemoryAllocatorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS) -I..
 MemoryAllocatorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
+MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a
 
 MemoryUsageObserverUnitTest_SOURCES = defs.hpp helpers.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp memoryusageobserver.hpp verbose.hpp 
 MemoryUsageObserverUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 MemoryUsageObserverUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
+MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a