Skip to content

Commit 04a6094

Browse files
pjohnmeyerpjohnmeyer
committed
Merge pull request #48 from magicant/autotools
Fix autotools configuration
2 parents 4661f37 + cda955d commit 04a6094

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

‎.gitignore

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
*.o
22
*.a
3+
*.lo
4+
*.la
35

46
# Visual Studio temp/user files
57
*.user
@@ -13,4 +15,29 @@ Release
1315
Debug
1416
MinSizeRel
1517
RelWithDebInfo
16-
ipch
18+
ipch
19+
20+
# files generated by autotools
21+
/aclocal.m4
22+
/autom4te.cache
23+
/config.guess
24+
/config.h
25+
/config.h.in
26+
/config.status
27+
/config.sub
28+
/configure
29+
/depcomp
30+
/install-sh
31+
/libtool
32+
/ltmain.sh
33+
/m4
34+
/missing
35+
/stamp-h*
36+
/test-driver
37+
/UnitTest++/TestUnitTest++
38+
Makefile
39+
Makefile.in
40+
.deps
41+
.libs
42+
*.log
43+
*.trs

‎Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
ACLOCAL_AMFLAGS = -I m4
12
EXTRA_DIST = docs
23
SUBDIRS = UnitTest++

‎UnitTest++/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lib_LTLIBRARIES = libUnitTest++.la
22
pkgincludedir = $(includedir)/UnitTest++
3-
nobase_pkginclude_HEADERS = UnitTest++.h Config.h Test.h TestDetails.h TestList.h TestSuite.h TestResults.h TestMacros.h CheckMacros.h TestRunner.h TimeConstraint.h ExecuteTest.h AssertException.h MemoryOutStream.h CurrentTest.h Posix/SignalTranslator.h Checks.h TimeHelpers.h Posix/TimeHelpers.h
3+
nobase_pkginclude_HEADERS = UnitTest++.h UnitTestPP.h Config.h HelperMacros.h Test.h TestDetails.h TestList.h TestSuite.h TestResults.h TestMacros.h CheckMacros.h TestRunner.h TimeConstraint.h ExecuteTest.h AssertException.h MemoryOutStream.h CurrentTest.h Posix/SignalTranslator.h Checks.h TimeHelpers.h Posix/TimeHelpers.h ExceptionMacros.h ReportAssert.h ReportAssertImpl.h CompositeTestReporter.h
44
libUnitTest___la_SOURCES = AssertException.cpp Test.cpp Checks.cpp TestRunner.cpp TestResults.cpp TestReporter.cpp TestReporterStdout.cpp ReportAssert.cpp TestList.cpp TimeConstraint.cpp TestDetails.cpp MemoryOutStream.cpp DeferredTestReporter.cpp DeferredTestResult.cpp XmlTestReporter.cpp CurrentTest.cpp Posix/SignalTranslator.cpp Posix/TimeHelpers.cpp CompositeTestReporter.cpp
55
libUnitTest___la_LDFLAGS = -version-number @LIBUNITTEST_SO_VERSION@
66
check_PROGRAMS = TestUnitTest++

‎configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
AC_PREREQ([2.69])
55
AC_INIT([UnitTest++], [1.4], [victor.lavaud@gmail.com])
66
AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp])
7+
AC_CONFIG_MACRO_DIR([m4])
78
AC_CONFIG_HEADERS([config.h])
89

9-
AM_INIT_AUTOMAKE()
10+
AM_INIT_AUTOMAKE([foreign])
1011
LT_INIT()
1112

1213
AC_SUBST([LIBUNITTEST_SO_VERSION], [1:4:0])

0 commit comments

Comments
 (0)