diff options
| author | Bastiaan Bakker <bastiaan.bakker@lifeline.nl> | 2001-04-28 17:23:32 +0000 |
|---|---|---|
| committer | Bastiaan Bakker <bastiaan.bakker@lifeline.nl> | 2001-04-28 17:23:32 +0000 |
| commit | 6d95c46d9dc342bea176c8fbcd101db8eba24bef (patch) | |
| tree | 3a42ea08625f64972f520cbeda2da3c68bbe9692 | |
| parent | 7e4ccacdbcf2f78005447f16e49d339d2a70e9ca (diff) | |
| download | cppunit-6d95c46d9dc342bea176c8fbcd101db8eba24bef.tar.gz | |
Moved files in subdir cppunit to src/cppunit.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | examples/Makefile.am | 4 | ||||
| -rw-r--r-- | examples/hierarchy/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/cppunit/Exception.cpp (renamed from cppunit/Exception.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/Makefile.am (renamed from cppunit/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/cppunit/TestCase.cpp (renamed from cppunit/TestCase.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/TestFailure.cpp (renamed from cppunit/TestFailure.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/TestRegistry.cpp (renamed from cppunit/TestRegistry.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/TestResult.cpp (renamed from cppunit/TestResult.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/TestSuite.cpp (renamed from cppunit/TestSuite.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/TextTestResult.cpp (renamed from cppunit/TextTestResult.cpp) | 0 | ||||
| -rw-r--r-- | src/cppunit/cppunit.dsp (renamed from cppunit/cppunit.dsp) | 0 | ||||
| -rw-r--r-- | src/cppunit/cppunit.dsw (renamed from cppunit/cppunit.dsw) | 0 | ||||
| -rw-r--r-- | src/cppunit/estring.h (renamed from cppunit/estring.h) | 0 |
16 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 7518c8f..38b9dfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ if DOC -SUBDIRS = config cppunit include examples doc +SUBDIRS = config src include examples doc else -SUBDIRS = config cppunit include examples +SUBDIRS = config src include examples endif -DIST_SUBDIRS = config cppunit include examples doc +DIST_SUBDIRS = config src include examples doc bin_SCRIPTS = cppunit-config diff --git a/configure.in b/configure.in index b10aaa6..9201e75 100644 --- a/configure.in +++ b/configure.in @@ -101,7 +101,8 @@ AC_OUTPUT([ cppunit.spec cppunit-config config/Makefile - cppunit/Makefile + src/Makefile + src/cppunit/Makefile include/Makefile include/cppunit/Makefile include/cppunit/extensions/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 432c2ce..b42c2b0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,7 @@ - SUBDIRS = hierarchy +# No dist subdir for msvc6: is handled by toplevel dist-hook +# DIST_SUBDIRS = msvc6 + EXTRA_DIST = examples.dsw diff --git a/examples/hierarchy/Makefile.am b/examples/hierarchy/Makefile.am index c023620..b274155 100644 --- a/examples/hierarchy/Makefile.am +++ b/examples/hierarchy/Makefile.am @@ -15,5 +15,5 @@ hierarchy_SOURCES= BoardGame.cpp \ ChessTest.h hierarchy_LDADD= \ - $(top_builddir)/cppunit/libcppunit.la + $(top_builddir)/src/cppunit/libcppunit.la diff --git a/src/Makefile.am b/src/Makefile.am index 48cad3e..ee092e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1,3 @@ -SUBDIRS = msvc6 +SUBDIRS = cppunit + +DIST_SUBDIRS = msvc6 diff --git a/cppunit/Exception.cpp b/src/cppunit/Exception.cpp index 51835ad..51835ad 100644 --- a/cppunit/Exception.cpp +++ b/src/cppunit/Exception.cpp diff --git a/cppunit/Makefile.am b/src/cppunit/Makefile.am index 09cc6e7..e883bbf 100644 --- a/cppunit/Makefile.am +++ b/src/cppunit/Makefile.am @@ -1,5 +1,5 @@ # -# $Id: Makefile.am,v 1.5 2001-04-19 20:47:22 bastiaan Exp $ +# $Id: Makefile.am,v 1.1 2001-04-28 18:23:32 bastiaan Exp $ # EXTRA_DIST = cppunit.dsw cppunit.dsp diff --git a/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp index f1e5198..f1e5198 100644 --- a/cppunit/TestCase.cpp +++ b/src/cppunit/TestCase.cpp diff --git a/cppunit/TestFailure.cpp b/src/cppunit/TestFailure.cpp index 6a48696..6a48696 100644 --- a/cppunit/TestFailure.cpp +++ b/src/cppunit/TestFailure.cpp diff --git a/cppunit/TestRegistry.cpp b/src/cppunit/TestRegistry.cpp index f4eaf74..f4eaf74 100644 --- a/cppunit/TestRegistry.cpp +++ b/src/cppunit/TestRegistry.cpp diff --git a/cppunit/TestResult.cpp b/src/cppunit/TestResult.cpp index a63652b..a63652b 100644 --- a/cppunit/TestResult.cpp +++ b/src/cppunit/TestResult.cpp diff --git a/cppunit/TestSuite.cpp b/src/cppunit/TestSuite.cpp index 8fe5e65..8fe5e65 100644 --- a/cppunit/TestSuite.cpp +++ b/src/cppunit/TestSuite.cpp diff --git a/cppunit/TextTestResult.cpp b/src/cppunit/TextTestResult.cpp index 9d5f017..9d5f017 100644 --- a/cppunit/TextTestResult.cpp +++ b/src/cppunit/TextTestResult.cpp diff --git a/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp index 18045fd..18045fd 100644 --- a/cppunit/cppunit.dsp +++ b/src/cppunit/cppunit.dsp diff --git a/cppunit/cppunit.dsw b/src/cppunit/cppunit.dsw index 0c89c6c..0c89c6c 100644 --- a/cppunit/cppunit.dsw +++ b/src/cppunit/cppunit.dsw diff --git a/cppunit/estring.h b/src/cppunit/estring.h index 2be5669..2be5669 100644 --- a/cppunit/estring.h +++ b/src/cppunit/estring.h |