You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2013/05/24 21:08:33 UTC
svn commit: r1486173 - in /tcl/rivet/branches/modular: ./ src/Makefile.am
src/apache-2/Makefile.am
Author: mxmanghi
Date: Fri May 24 19:08:32 2013
New Revision: 1486173
URL: http://svn.apache.org/r1486173
Log:
adding branch 'modular' to reform the build system towards a better modular organization
Added:
tcl/rivet/branches/modular/
- copied from r1486142, tcl/rivet/trunk/
Modified:
tcl/rivet/branches/modular/src/Makefile.am
tcl/rivet/branches/modular/src/apache-2/Makefile.am
Modified: tcl/rivet/branches/modular/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/Makefile.am?rev=1486173&r1=1486142&r2=1486173&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/Makefile.am Fri May 24 19:08:32 2013
@@ -16,6 +16,28 @@
SUBDIRS = librivet parser @apache_version_dir@
+# The weird and wild magic of auto* associates these two.
+apxs_libexecdir = @APXS_LIBEXECDIR@
+apxs_libexec_LTLIBRARIES = mod_rivet.la
+
+INCLUDES = @apache_include@ -I@RIVET_BASE_INCLUDE@ -Iparser -I@apache_version_dir@
+#
+# Apache Rivet Module, mod_rivet.so / mod_rivet.dll
+#
+mod_rivet_la_SOURCES = \
+ @apache_version_dir@/apache_multipart_buffer.c \
+ @apache_version_dir@/apache_request.c \
+ @apache_version_dir@/mod_rivet.c \
+ @apache_version_dir@/TclWebapache.c \
+ @apache_version_dir@/rivetCore.c \
+ @apache_version_dir@/rivetConf.c \
+ rivetChannel.c \
+ parser/rivetParser.c
+
+mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
+mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
+mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+
# Removing libtool .la files from installation
install-data-hook:
Modified: tcl/rivet/branches/modular/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/apache-2/Makefile.am?rev=1486173&r1=1486142&r2=1486173&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/apache-2/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/apache-2/Makefile.am Fri May 24 19:08:32 2013
@@ -16,10 +16,9 @@
# AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
-
-# The weird and wild magic of auto* associates these two.
-apxs_libexecdir = @APXS_LIBEXECDIR@
-apxs_libexec_LTLIBRARIES = mod_rivet.la
+## The weird and wild magic of auto* associates these two.
+#apxs_libexecdir = @APXS_LIBEXECDIR@
+#apxs_libexec_LTLIBRARIES = mod_rivet.la
INCLUDES = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser
@@ -28,24 +27,24 @@ INCLUDES = @apache_include@ -I@RIVET_BAS
##lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
##lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
-#
-# Apache Rivet Module, mod_rivet.so / mod_rivet.dll
-#
-mod_rivet_la_SOURCES = \
- apache_multipart_buffer.c \
- apache_request.c \
- mod_rivet.c \
- TclWebapache.c \
- rivetCore.c \
- rivetConf.c \
- ../rivetChannel.c \
- ../parser/rivetParser.c
+##
+## Apache Rivet Module, mod_rivet.so / mod_rivet.dll
+##
+#mod_rivet_la_SOURCES = \
+# apache_multipart_buffer.c \
+# apache_request.c \
+# mod_rivet.c \
+# TclWebapache.c \
+# rivetCore.c \
+# rivetConf.c \
+# ../rivetChannel.c \
+# ../parser/rivetParser.c
##mod_rivet_la_SOURCES = mod_rivet.c mod_rivet.h
-mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
-mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+#mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
+#mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
+#mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org