Author: tschoening
Date: Thu Mar 24 19:32:13 2016
New Revision: 1736491
URL: http://svn.apache.org/viewvc?rev=1736491&view=rev
Log:
LOGCXX-433: Moved our m4 files into some subdir as (partly) suggested by
libtoolize to clean up the root folder a bit.
Added:
incubator/log4cxx/trunk/src/m4/
incubator/log4cxx/trunk/src/m4/Makefile.am
- copied, changed from r1736467, incubator/log4cxx/trunk/Makefile.am
incubator/log4cxx/trunk/src/m4/find_apr.m4
- copied unchanged from r1736467, incubator/log4cxx/trunk/find_apr.m4
incubator/log4cxx/trunk/src/m4/find_apu.m4
- copied unchanged from r1736467, incubator/log4cxx/trunk/find_apu.m4
Removed:
incubator/log4cxx/trunk/find_apr.m4
incubator/log4cxx/trunk/find_apu.m4
Modified:
incubator/log4cxx/trunk/Makefile.am
incubator/log4cxx/trunk/configure.ac
incubator/log4cxx/trunk/src/Makefile.am
incubator/log4cxx/trunk/src/assembly/source.xml
Modified: incubator/log4cxx/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/Makefile.am?rev=1736491&r1=1736490&r2=1736491&view=diff
==============================================================================
--- incubator/log4cxx/trunk/Makefile.am (original)
+++ incubator/log4cxx/trunk/Makefile.am Thu Mar 24 19:32:13 2016
@@ -14,15 +14,15 @@
# limitations under the License.
#
AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I src/m4
SUBDIRS = src
EXTRA_DIST = \
aclocal.m4 \
autogen.sh \
build.xml \
- find_apr.m4 \
- find_apu.m4 \
+ src/m4/find_apr.m4 \
+ src/m4/find_apu.m4 \
INSTALL \
KEYS \
LICENSE \
Modified: incubator/log4cxx/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/configure.ac?rev=1736491&r1=1736490&r2=1736491&view=diff
==============================================================================
--- incubator/log4cxx/trunk/configure.ac (original)
+++ incubator/log4cxx/trunk/configure.ac Thu Mar 24 19:32:13 2016
@@ -14,6 +14,7 @@
# limitations under the License.
AC_INIT([log4cxx], [0.11.0])
+AC_CONFIG_MACRO_DIR([src/m4])
AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
# autoconf 2.50 or higher to rebuild aclocal.m4, because the
@@ -469,6 +470,7 @@ 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/m4/Makefile
src/site/Makefile
src/site/doxy/Makefile
src/site/doxy/Doxyfile
Modified: incubator/log4cxx/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/Makefile.am?rev=1736491&r1=1736490&r2=1736491&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/Makefile.am (original)
+++ incubator/log4cxx/trunk/src/Makefile.am Thu Mar 24 19:32:13 2016
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SUBDIRS = main examples site test
+SUBDIRS = main examples site test
+DIST_SUBDIRS = ${SUBDIRS} m4
Modified: incubator/log4cxx/trunk/src/assembly/source.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/assembly/source.xml?rev=1736491&r1=1736490&r2=1736491&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/assembly/source.xml (original)
+++ incubator/log4cxx/trunk/src/assembly/source.xml Thu Mar 24 19:32:13 2016
@@ -47,8 +47,6 @@
<include>NOTICE</include>
<include>build.xml</include>
<include>configure.in</include>
- <include>find_apr.m4</include>
- <include>find_apu.m4</include>
<include>liblog4cxx.pc.in</include>
<include>pom.xml</include>
<include>Makefile.in</include>
@@ -65,6 +63,11 @@
<exclude>src/examples/cpp/delayedloop</exclude>
<exclude>src/examples/cpp/stream</exclude>
<exclude>src/examples/cpp/trivial</exclude>
+ <exclude>src/m4/libtool.m4</exclude>
+ <exclude>src/m4/ltoptions.m4</exclude>
+ <exclude>src/m4/ltsugar.m4</exclude>
+ <exclude>src/m4/ltversion.m4</exclude>
+ <exclude>src/m4/lt~obsolete.m4</exclude>
<exclude>**/Makefile</exclude>
<exclude>**/*.o</exclude>
<exclude>**/*.Po</exclude>
Copied: incubator/log4cxx/trunk/src/m4/Makefile.am (from r1736467,
incubator/log4cxx/trunk/Makefile.am)
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/m4/Makefile.am?p2=incubator/log4cxx/trunk/src/m4/Makefile.am&p1=incubator/log4cxx/trunk/Makefile.am&r1=1736467&r2=1736491&rev=1736491&view=diff
==============================================================================
--- incubator/log4cxx/trunk/Makefile.am (original)
+++ incubator/log4cxx/trunk/src/m4/Makefile.am Thu Mar 24 19:32:13 2016
@@ -13,21 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I .
+#DISTCLEANFILES = libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4
lt~obsolete.m4
-SUBDIRS = src
-EXTRA_DIST = \
- aclocal.m4 \
- autogen.sh \
- build.xml \
- find_apr.m4 \
- find_apu.m4 \
- INSTALL \
- KEYS \
- LICENSE \
- NOTICE \
- pom.xml
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liblog4cxx.pc
+dist-hook:
+ -rm -f "$(distdir)/libtool.m4" \
+ "$(distdir)/ltoptions.m4" \
+ "$(distdir)/ltsugar.m4" \
+ "$(distdir)/ltversion.m4" \
+ "$(distdir)/lt~obsolete.m4"
