Hi,
I intend to commit the following patches; they are all a first step
towards creating a proper dist-tarball with the GNU autotools based
build.
Any objections?
Thanks,
Andreas
jira LOGCXX-119:
================
Index: tests/src/Makefile.am
===================================================================
--- tests/src/Makefile.am (Revision 332794)
+++ tests/src/Makefile.am (Arbeitskopie)
@@ -23,7 +23,8 @@
consoleappendertestcase.cpp\
fileappendertestcase.cpp\
rollingfileappendertestcase.cpp\
- writerappendertestcase.cpp
+ writerappendertestcase.cpp \
+ ndctestcase.cpp
testsuite_LDADD = \
jira LOGCXX-43:
===============
Index: include/log4cxx/Makefile.am
===================================================================
--- include/log4cxx/Makefile.am (Revision 332794)
+++ include/log4cxx/Makefile.am (Arbeitskopie)
@@ -2,3 +2,8 @@
log4cxxincdir = $(includedir)/log4cxx
log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h log4cxx.h
DISTCLEANFILES = log4cxx.h
+EXTRA_DIST = log4cxx.hw
+
+dist-hook:
+ -rm -f $(distdir)/log4cxx.h
+
Index: include/log4cxx/private/Makefile.am
===================================================================
--- include/log4cxx/private/Makefile.am (Revision 332794)
+++ include/log4cxx/private/Makefile.am (Arbeitskopie)
@@ -1,3 +1,4 @@
privateincdir = $(includedir)/log4cxx/private
-privateinc_HEADERS= $(top_srcdir)/include/log4cxx/private/*.h
log4cxx_private.h
+privateinc_HEADERS= $(top_builddir)/include/log4cxx/private/*.h
log4cxx_private.h
DISTCLEANFILES = log4cxx_private.h
+EXTRA_DIST = log4cxx_private.hw
Index: docs/Makefile.am
===================================================================
--- docs/Makefile.am (Revision 332794)
+++ docs/Makefile.am (Arbeitskopie)
@@ -67,3 +67,6 @@
$(RM) -r latex
$(RM) -r html man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
+dist-hook:
+ -rm -f $(distdir)/Doxyfile
+
Index: tests/witness/encoding/Makefile.am
===================================================================
--- tests/witness/encoding/Makefile.am (Revision 332794)
+++ tests/witness/encoding/Makefile.am (Arbeitskopie)
@@ -1 +1,3 @@
-EXTRA_DIST = *
\ No newline at end of file
+EXTRA_DIST = UTF-* \
+ ascii.log \
+ latin1.log
Index: tests/witness/rolling/Makefile.am
===================================================================
--- tests/witness/rolling/Makefile.am (Revision 332794)
+++ tests/witness/rolling/Makefile.am (Arbeitskopie)
@@ -1 +1,3 @@
-EXTRA_DIST = *
\ No newline at end of file
+EXTRA_DIST = sbr-test* \
+ tbr-test*
+
Index: tests/witness/ndc/Makefile.am
===================================================================
--- tests/witness/ndc/Makefile.am (Revision 332794)
+++ tests/witness/ndc/Makefile.am (Arbeitskopie)
@@ -1 +1 @@
-EXTRA_DIST = *
\ No newline at end of file
+EXTRA_DIST = NDC.*
Index: tests/witness/Makefile.am
===================================================================
--- tests/witness/Makefile.am (Revision 332794)
+++ tests/witness/Makefile.am (Arbeitskopie)
@@ -1,2 +1,14 @@
SUBDIRS = encoding ndc rolling
-EXTRA_DIST = *
+EXTRA_DIST = LevelMatchFilter* \
+ LevelRangeFilter* \
+ NDCMatchFilter* \
+ custom* \
+ dom.* \
+ hierarchyThreshold.* \
+ l7d.* \
+ patternLayout.* \
+ socketServer.* \
+ xmlLayout.* \
+ fallback \
+ simple \
+ ttcc
Index: Makefile.am
===================================================================
--- Makefile.am (Revision 332794)
+++ Makefile.am (Arbeitskopie)
@@ -1,5 +1,2 @@
SUBDIRS = docs src include simplesocketserver tests performance examples
-EXTRA_DIST = autogen.sh license.apl find_apr.m4
-
-
-
+EXTRA_DIST = autogen.sh aclocal.m4 license.apl find_apr.m4 find_apu.m4
build.xml apr-build.xml aprutil-build.xml apr-1.2.2.patch
apr-util-1.2.2.patch cppunit-build.xml
