ilusha/unittest-cpp
1
0
Fork 0
mirror of https://github.com/unittest-cpp/unittest-cpp synced 2026-09-26 16:19:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix autotools configuration

Browse source 
* Add some headers to the list of installed files.
* Specify the "foreign" strictness so that automake does not complain
  about missing files.
* Specify a directory for m4 macros as suggested by libtoolize.
* Add autotools-generated files to gitignore.
This commit is contained in:
WATANABE Yuki 2013-07-20 13:12:47 +09:00
parent cc3fbd8e0b
commit cda955dee4
4 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
.gitignore vendored
View file

@ -1,5 +1,7 @@
*.o
*.a
*.lo
*.la
# Visual Studio temp/user files
*.user
@ -13,4 +15,29 @@ Release
Debug
MinSizeRel
RelWithDebInfo
ipch
ipch
# files generated by autotools
/aclocal.m4
/autom4te.cache
/config.guess
/config.h
/config.h.in
/config.status
/config.sub
/configure
/depcomp
/install-sh
/libtool
/ltmain.sh
/m4
/missing
/stamp-h*
/test-driver
/UnitTest++/TestUnitTest++
Makefile
Makefile.in
.deps
.libs
*.log
*.trs

1
Makefile.am
View file

@ -1,2 +1,3 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = docs
SUBDIRS = UnitTest++

2
UnitTest++/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libUnitTest++.la
pkgincludedir = $(includedir)/UnitTest++
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
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
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
libUnitTest___la_LDFLAGS = -version-number @LIBUNITTEST_SO_VERSION@
check_PROGRAMS = TestUnitTest++

3
configure.ac
View file

@ -4,9 +4,10 @@
AC_PREREQ([2.69])
AC_INIT([UnitTest++], [1.4], [victor.lavaud@gmail.com])
AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE()
AM_INIT_AUTOMAKE([foreign])
LT_INIT()
AC_SUBST([LIBUNITTEST_SO_VERSION], [1:4:0])