You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by af...@apache.org on 2007/07/31 21:50:57 UTC
svn commit: r561465 - in /logging/log4cxx/trunk: ./ src/ src/examples/
src/examples/cpp/ src/main/ src/main/cpp/ src/main/include/log4cxx/
src/main/include/log4cxx/config/ src/main/include/log4cxx/db/
src/main/include/log4cxx/filter/ src/main/include/l...
Author: afester
Date: Tue Jul 31 12:50:54 2007
New Revision: 561465
URL: http://svn.apache.org/viewvc?view=rev&rev=561465
Log:
LOGCXX-189: fixed autotools build
Added:
logging/log4cxx/trunk/src/examples/Makefile.am
logging/log4cxx/trunk/src/main/Makefile.am
logging/log4cxx/trunk/src/performance/Makefile.am
logging/log4cxx/trunk/src/simplesocketserver/Makefile.am
logging/log4cxx/trunk/src/site/Makefile.am
logging/log4cxx/trunk/src/test/Makefile.am
Modified:
logging/log4cxx/trunk/Makefile.am
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/src/examples/ (props changed)
logging/log4cxx/trunk/src/examples/cpp/Makefile.am
logging/log4cxx/trunk/src/main/ (props changed)
logging/log4cxx/trunk/src/main/cpp/ (props changed)
logging/log4cxx/trunk/src/main/cpp/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am
logging/log4cxx/trunk/src/performance/ (props changed)
logging/log4cxx/trunk/src/performance/cpp/Makefile.am
logging/log4cxx/trunk/src/simplesocketserver/ (props changed)
logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am
logging/log4cxx/trunk/src/site/ (props changed)
logging/log4cxx/trunk/src/site/doxy/Makefile.am
logging/log4cxx/trunk/src/test/ (props changed)
logging/log4cxx/trunk/src/test/cpp/Makefile.am
logging/log4cxx/trunk/src/test/resources/Makefile.am
Modified: logging/log4cxx/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+AUTOMAKE_OPTIONS = foreign
+
SUBDIRS = src
EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml NOTICE LICENSE
Modified: logging/log4cxx/trunk/configure.in
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Tue Jul 31 12:50:54 2007
@@ -1,4 +1,4 @@
-AC_INIT(src/logger.cpp)
+AC_INIT(src/main/cpp/logger.cpp)
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -109,11 +109,13 @@
fi
manual_dest="manual"
+base_dir=${ac_abs_confdir}
AC_SUBST(enable_dot)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
AC_SUBST(manual_dest)
+AC_SUBST(base_dir)
# CppUnit
@@ -189,7 +191,6 @@
else
AC_SUBST(HAS_SYSLOG, 0)
fi
-
# Checks for libraries
# ----------------------------------------------------------------------------
@@ -371,40 +372,47 @@
AC_CONFIG_FILES([
Makefile
liblog4cxx.pc
-docs/Makefile
-docs/Doxyfile
src/Makefile
-include/Makefile
-include/log4cxx/log4cxx.h
-include/log4cxx/private/log4cxx_private.h
-include/log4cxx/private/Makefile
-include/log4cxx/Makefile
-include/log4cxx/helpers/Makefile
-include/log4cxx/net/Makefile
-include/log4cxx/nt/Makefile
-include/log4cxx/spi/Makefile
-include/log4cxx/spi/location/Makefile
-include/log4cxx/varia/Makefile
-include/log4cxx/xml/Makefile
-include/log4cxx/config/Makefile
-include/log4cxx/db/Makefile
-include/log4cxx/rolling/Makefile
-include/log4cxx/pattern/Makefile
-include/log4cxx/filter/Makefile
-simplesocketserver/Makefile
-tests/Makefile
-tests/input/Makefile
-tests/input/performance/Makefile
-tests/input/ndc/Makefile
-tests/input/rolling/Makefile
-tests/input/xml/Makefile
-tests/src/Makefile
-tests/witness/Makefile
-tests/witness/encoding/Makefile
-tests/witness/ndc/Makefile
-tests/witness/rolling/Makefile
-performance/Makefile
-performance/xml/Makefile
-examples/Makefile
+src/main/Makefile
+src/main/cpp/Makefile
+src/main/include/Makefile
+src/main/include/log4cxx/log4cxx.h
+src/main/include/log4cxx/private/log4cxx_private.h
+src/main/include/log4cxx/private/Makefile
+src/main/include/log4cxx/Makefile
+src/main/include/log4cxx/helpers/Makefile
+src/main/include/log4cxx/net/Makefile
+src/main/include/log4cxx/nt/Makefile
+src/main/include/log4cxx/spi/Makefile
+src/main/include/log4cxx/spi/location/Makefile
+src/main/include/log4cxx/varia/Makefile
+src/main/include/log4cxx/xml/Makefile
+src/main/include/log4cxx/config/Makefile
+src/main/include/log4cxx/db/Makefile
+src/main/include/log4cxx/rolling/Makefile
+src/main/include/log4cxx/pattern/Makefile
+src/main/include/log4cxx/filter/Makefile
+src/site/Makefile
+src/site/doxy/Makefile
+src/site/doxy/Doxyfile
+src/test/Makefile
+src/test/resources/Makefile
+src/test/resources/input/Makefile
+src/test/resources/input/performance/Makefile
+src/test/resources/input/ndc/Makefile
+src/test/resources/input/rolling/Makefile
+src/test/resources/input/xml/Makefile
+src/test/cpp/Makefile
+src/test/resources/witness/Makefile
+src/test/resources/witness/encoding/Makefile
+src/test/resources/witness/ndc/Makefile
+src/test/resources/witness/rolling/Makefile
+src/simplesocketserver/Makefile
+src/simplesocketserver/cpp/Makefile
+src/performance/Makefile
+src/performance/cpp/Makefile
+src/performance/cpp/xml/Makefile
+src/examples/Makefile
+src/examples/cpp/Makefile
])
AC_OUTPUT
Modified: logging/log4cxx/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SUBDIRS = main test
+SUBDIRS = main test simplesocketserver examples performance site
Propchange: logging/log4cxx/trunk/src/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/examples/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/examples/Makefile.am (added)
+++ logging/log4cxx/trunk/src/examples/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = cpp
Modified: logging/log4cxx/trunk/src/examples/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/examples/cpp/Makefile.am Tue Jul 31 12:50:54 2007
@@ -15,18 +15,17 @@
#
noinst_PROGRAMS = trivial delayedloop stream console
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
trivial_SOURCES = trivial.cpp
-trivial_LDADD = $(top_builddir)/src/liblog4cxx.la
+trivial_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
delayedloop_SOURCES = delayedloop.cpp
-delayedloop_LDADD = $(top_builddir)/src/liblog4cxx.la
+delayedloop_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
stream_SOURCES = stream.cpp
-stream_LDADD = $(top_builddir)/src/liblog4cxx.la
+stream_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
console_SOURCES = console.cpp
-console_LDADD = $(top_builddir)/src/liblog4cxx.la
-
+console_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
Propchange: logging/log4cxx/trunk/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/Makefile.am (added)
+++ logging/log4cxx/trunk/src/main/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = cpp include
Propchange: logging/log4cxx/trunk/src/main/cpp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Modified: logging/log4cxx/trunk/src/main/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/cpp/Makefile.am Tue Jul 31 12:50:54 2007
@@ -15,7 +15,7 @@
#
lib_LTLIBRARIES = liblog4cxx.la
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
liblog4cxx_la_SOURCES = \
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am Tue Jul 31 12:50:54 2007
@@ -15,7 +15,7 @@
#
SUBDIRS = helpers net nt rolling spi varia xml config db private pattern filter
log4cxxincdir = $(includedir)/log4cxx
-log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h log4cxx.h
+log4cxxinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/*.h log4cxx.h
DISTCLEANFILES = log4cxx.h
EXTRA_DIST = log4cxx.hw
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
configincdir = $(includedir)/log4cxx/config
-configinc_HEADERS= $(top_srcdir)/include/log4cxx/config/*.h
+configinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/config/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
dbincdir = $(includedir)/log4cxx/db
-dbinc_HEADERS= $(top_srcdir)/include/log4cxx/db/*.h
+dbinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/db/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
filterincdir = $(includedir)/log4cxx/filter
-filterinc_HEADERS= $(top_srcdir)/include/log4cxx/filter/*.h
+filterinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/filter/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
helpersincdir = $(includedir)/log4cxx/helpers
-helpersinc_HEADERS= $(top_srcdir)/include/log4cxx/helpers/*.h
+helpersinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/helpers/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
netincdir = $(includedir)/log4cxx/net
-netinc_HEADERS= $(top_srcdir)/include/log4cxx/net/*.h
+netinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/net/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
ntincdir = $(includedir)/log4cxx/nt
-ntinc_HEADERS= $(top_srcdir)/include/log4cxx/nt/*.h
+ntinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/nt/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
patternincdir = $(includedir)/log4cxx/pattern
-patterninc_HEADERS= $(top_srcdir)/include/log4cxx/pattern/*.h
+patterninc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/pattern/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,7 +14,7 @@
# limitations under the License.
#
privateincdir = $(includedir)/log4cxx/private
-privateinc_HEADERS= $(top_builddir)/include/log4cxx/private/*.h log4cxx_private.h
+privateinc_HEADERS= $(top_builddir)/src/main/include/log4cxx/private/*.h log4cxx_private.h
DISTCLEANFILES = log4cxx_private.h
EXTRA_DIST = log4cxx_private.hw
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
rollingincdir = $(includedir)/log4cxx/rolling
-rollinginc_HEADERS= $(top_srcdir)/include/log4cxx/rolling/*.h
+rollinginc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/rolling/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am Tue Jul 31 12:50:54 2007
@@ -15,5 +15,5 @@
#
SUBDIRS = location
spiincdir = $(includedir)/log4cxx/spi
-spiinc_HEADERS= $(top_srcdir)/include/log4cxx/spi/*.h
+spiinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/spi/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
spiincdir = $(includedir)/log4cxx/spi/location
-spiinc_HEADERS= $(top_srcdir)/include/log4cxx/spi/location/*.h
+spiinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/spi/location/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
variaincdir = $(includedir)/log4cxx/varia
-variainc_HEADERS= $(top_srcdir)/include/log4cxx/varia/*.h
+variainc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/varia/*.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,5 +14,5 @@
# limitations under the License.
#
xmlincdir = $(includedir)/log4cxx/xml
-xmlinc_HEADERS= $(top_srcdir)/include/log4cxx/xml/*.h
+xmlinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/xml/*.h
Propchange: logging/log4cxx/trunk/src/performance/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/performance/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/performance/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/performance/Makefile.am (added)
+++ logging/log4cxx/trunk/src/performance/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = cpp
Modified: logging/log4cxx/trunk/src/performance/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/performance/cpp/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/performance/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/performance/cpp/Makefile.am Tue Jul 31 12:50:54 2007
@@ -18,10 +18,10 @@
noinst_PROGRAMS = logging
performanceincdir = $(includedir)/log4cxx
-noinst_HEADERS= $(top_srcdir)/performance/*.h
+noinst_HEADERS= $(top_srcdir)/src/performance/include/*.h
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include -I$(top_srcdir)/src/performance/include
logging_SOURCES = main.cpp nullappender.cpp
-logging_LDADD = $(top_builddir)/src/liblog4cxx.la
+logging_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
Propchange: logging/log4cxx/trunk/src/simplesocketserver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/simplesocketserver/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/simplesocketserver/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/simplesocketserver/Makefile.am (added)
+++ logging/log4cxx/trunk/src/simplesocketserver/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = cpp
Modified: logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,13 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
AM_CPPFLAGS = @CPPFLAGS_ODBC@
bin_PROGRAMS = simplesocketserver
simplesocketserver_SOURCES = simplesocketserver.cpp
-simplesocketserver_LDADD = $(top_builddir)/src/liblog4cxx.la
-
-
+simplesocketserver_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
Propchange: logging/log4cxx/trunk/src/site/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/site/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/site/Makefile.am (added)
+++ logging/log4cxx/trunk/src/site/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = doxy
Modified: logging/log4cxx/trunk/src/site/doxy/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/doxy/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/site/doxy/Makefile.am (original)
+++ logging/log4cxx/trunk/src/site/doxy/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-EXTRA_DIST = Doxyfile mainpage.dox introduction.dox simplesocketserver.1
+EXTRA_DIST = Doxyfile mainpage.dox simplesocketserver.1
# DOC is defined if installer requests doc generation.
@@ -61,7 +61,7 @@
all-local: dox
-@manual_dest@/index.html: Doxyfile introduction.dox mainpage.dox
+@manual_dest@/index.html: Doxyfile mainpage.dox
"@DOXYGEN@"
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)
Propchange: logging/log4cxx/trunk/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 31 12:50:54 2007
@@ -0,0 +1 @@
+Makefile.in
Added: logging/log4cxx/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/Makefile.am?view=auto&rev=561465
==============================================================================
--- logging/log4cxx/trunk/src/test/Makefile.am (added)
+++ logging/log4cxx/trunk/src/test/Makefile.am Tue Jul 31 12:50:54 2007
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+SUBDIRS = cpp resources
Modified: logging/log4cxx/trunk/src/test/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/cpp/Makefile.am Tue Jul 31 12:50:54 2007
@@ -14,17 +14,17 @@
# limitations under the License.
#
noinst_HEADERS = \
- $(top_srcdir)/tests/src/customlogger/*.h \
- $(top_srcdir)/tests/src/helpers/*.h \
- $(top_srcdir)/tests/src/net/*.h \
- $(top_srcdir)/tests/src/pattern/*.h \
- $(top_srcdir)/tests/src/util/*.h \
- $(top_srcdir)/tests/src/xml/*.h \
- $(top_srcdir)/tests/src/*.h
+ $(top_srcdir)/src/test/cpp/customlogger/*.h \
+ $(top_srcdir)/src/test/cpp/helpers/*.h \
+ $(top_srcdir)/src/test/cpp/net/*.h \
+ $(top_srcdir)/src/test/cpp/pattern/*.h \
+ $(top_srcdir)/src/test/cpp/util/*.h \
+ $(top_srcdir)/src/test/cpp/xml/*.h \
+ $(top_srcdir)/src/test/cpp/*.h
if TESTS
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
noinst_PROGRAMS = testsuite shortsocketserver
@@ -147,7 +147,7 @@
ndctestcase.cpp
testsuite_LDADD = \
- $(top_builddir)/src/liblog4cxx.la
+ $(top_builddir)/src/main/cpp/liblog4cxx.la
testsuite_LDFLAGS = \
@LIBS_CPPUNIT@
@@ -156,7 +156,7 @@
@CPPFLAGS_CPPUNIT@
testsuite_DEPENDENCIES = \
- $(top_builddir)/src/liblog4cxx.la
+ $(top_builddir)/src/main/cpp/liblog4cxx.la
shortsocketserver_SOURCES = \
$(util) \
@@ -164,13 +164,13 @@
shortsocketserver.cpp
shortsocketserver_LDADD = \
- $(top_builddir)/src/liblog4cxx.la
+ $(top_builddir)/src/main/cpp/liblog4cxx.la
shortsocketserver_LDFLAGS = \
@LIBS_CPPUNIT@
shortsocketserver_DEPENDENCIES = \
- $(top_builddir)/src/liblog4cxx.la
+ $(top_builddir)/src/main/cpp/liblog4cxx.la
check: testsuite shortsocketserver
Modified: logging/log4cxx/trunk/src/test/resources/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/resources/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SUBDIRS = input witness src
+SUBDIRS = input witness
EXTRA_DIST = log4j.dtd L7D_en_US.properties L7D_fr_CH.properties L7D_fr.properties
if TESTS