Skip to content

Commit 26dd5e5

Browse files
committed
Rework liblog4cplus, loggingserver and tests builds to use non-recursive make style.
1 parent e5648cc commit 26dd5e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1229
-11194
lines changed

Makefile.am

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ACLOCAL_AMFLAGS = -I m4
22
EXTRA_DIST = ChangeLog log4cplus.pc.in
3-
SUBDIRS = include src loggingserver tests
3+
SUBDIRS = include
44
if WITH_SWIG
55
SUBDIRS += swig
66
endif
@@ -9,3 +9,62 @@ SUBDIRS += qt4debugappender
99
endif
1010
pkgconfigdir = $(libdir)/pkgconfig
1111
pkgconfig_DATA = log4cplus.pc
12+
13+
liblog4cplus_la_file = $(top_builddir)/liblog4cplus.la
14+
include src/Makefile.am
15+
16+
include tests/appender_test/Makefile.am
17+
include tests/customloglevel_test/Makefile.am
18+
include tests/fileappender_test/Makefile.am
19+
include tests/filter_test/Makefile.am
20+
include tests/hierarchy_test/Makefile.am
21+
include tests/loglog_test/Makefile.am
22+
include tests/ndc_test/Makefile.am
23+
include tests/ostream_test/Makefile.am
24+
include tests/patternlayout_test/Makefile.am
25+
include tests/performance_test/Makefile.am
26+
include tests/priority_test/Makefile.am
27+
include tests/propertyconfig_test/Makefile.am
28+
include tests/socket_test/Makefile.am
29+
include tests/timeformat_test/Makefile.am
30+
31+
if MULTI_THREADED
32+
include tests/thread_test/Makefile.am
33+
include tests/configandwatch_test/Makefile.am
34+
endif
35+
36+
include simpleserver/Makefile.am
37+
38+
TESTSUITE = tests/testsuite
39+
AUTOTEST = $(AUTOM4TE) --language=Autotest
40+
TESTSUITE_AT = \
41+
tests/appender_test.at \
42+
tests/configandwatch_test.at \
43+
tests/customloglevel_test.at \
44+
tests/fileappender_test.at \
45+
tests/filter_test.at \
46+
tests/hierarchy_test.at \
47+
tests/loglog_test.at \
48+
tests/ndc_test.at \
49+
tests/ostream_test.at \
50+
tests/patternlayout_test.at \
51+
tests/priority_test.at \
52+
tests/propertyconfig_test.at \
53+
tests/thread_test.at \
54+
tests/timeformat_test.at \
55+
tests/local.at \
56+
tests/testsuite.at
57+
58+
$(TESTSUITE): $(TESTSUITE_AT)
59+
$(AUTOTEST) -I $(srcdir) $(srcdir)/tests/testsuite.at -o $@
60+
61+
tests/atconfig: $(top_builddir)/config.status
62+
cd "$(top_builddir)" && ./config.status tests/$@
63+
64+
check-local: tests/atconfig tests/atlocal $(TESTSUITE)
65+
cd "$(top_builddir)/tests" && $(SHELL) $(abs_top_srcdir)/$(TESTSUITE) $(TESTSUITEFLAGS)
66+
67+
clean-local:
68+
cd "$(top_builddir)/tests" && (test ! -f '$(abs_top_srcdir)/$(TESTSUITE)' || $(SHELL) '$(abs_top_srcdir)/$(TESTSUITE)' --clean)
69+
70+
EXTRA_DIST += tests/testsuite.at $(TESTSUITE) tests/atlocal.in

0 commit comments

Comments
 (0)