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/09/17 23:21:28 UTC
svn commit: r1524227 - in /tcl/rivet/trunk: ChangeLog
src/apache-2/Makefile.am src/librivet/Makefile.am src/parser/Makefile.am
Author: mxmanghi
Date: Tue Sep 17 21:21:28 2013
New Revision: 1524227
URL: http://svn.apache.org/r1524227
Log:
* src/[parser|apache-2|librivet]/Makefile.am: AM_CPPFLAGS are not
a transparent replacement for INCLUDES at least when a Makefile.am is
in a subdirectory. Placing include directory switches in the target
specific <target>_CPPFLAGS variable
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/src/apache-2/Makefile.am
tcl/rivet/trunk/src/librivet/Makefile.am
tcl/rivet/trunk/src/parser/Makefile.am
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1524227&r1=1524226&r2=1524227&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Sep 17 21:21:28 2013
@@ -1,3 +1,9 @@
+2013-09-17 Massimo Manghi <mx...@apache.org>
+ * src/[parser|apache-2|librivet]/Makefile.am: AM_CPPFLAGS are not
+ a transparent replacement for INCLUDES at least when a Makefile.am is
+ in a subdirectory. Placing include directory switches in the target
+ specific <target>_CPPFLAGS variable
+
2013-09-15 Massimo Manghi <mx...@apache.org>
* tclconfig/missing: new version of 'missing' taken from automake 1.14
* src/[parser|apache-2|librivet]/Makefile.am: depracated INCLUDES variables
Modified: tcl/rivet/trunk/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/Makefile.am?rev=1524227&r1=1524226&r2=1524227&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/Makefile.am (original)
+++ tcl/rivet/trunk/src/apache-2/Makefile.am Tue Sep 17 21:21:28 2013
@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = subdir-objects
apxs_libexecdir = @APXS_LIBEXECDIR@
apxs_libexec_LTLIBRARIES = mod_rivet.la
-AM_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser
+#AM_CPPFLAGS =
# ... and these two. We want to put the libs in the package path,
# rather than the standard library location for the system.
@@ -46,7 +46,7 @@ mod_rivet_la_SOURCES = \
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_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
Modified: tcl/rivet/trunk/src/librivet/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/librivet/Makefile.am?rev=1524227&r1=1524226&r2=1524227&view=diff
==============================================================================
--- tcl/rivet/trunk/src/librivet/Makefile.am (original)
+++ tcl/rivet/trunk/src/librivet/Makefile.am Tue Sep 17 21:21:28 2013
@@ -16,7 +16,7 @@
# $Id$
-AM_CPPFLAGS = @apache_include@ -I../@apache_version_dir@ -I..
+#AM_CPPFLAGS = @apache_include@
# ... and these two. We want to put the libs in the package path,
# rather than the standard library location for the system.
@@ -30,5 +30,5 @@ lib_libexec_LTLIBRARIES = librivetlib.la
librivetlib_la_SOURCES = rivetList.c rivetCrypt.c rivetWWW.c rivetPkgInit.c
librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
librivetlib_la_LIBADD = @APXS_LIBS@
-librivetlib_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+librivetlib_la_CPPFLAGS = -I.. -I../@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
Modified: tcl/rivet/trunk/src/parser/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/parser/Makefile.am?rev=1524227&r1=1524226&r2=1524227&view=diff
==============================================================================
--- tcl/rivet/trunk/src/parser/Makefile.am (original)
+++ tcl/rivet/trunk/src/parser/Makefile.am Tue Sep 17 21:21:28 2013
@@ -14,10 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = @apache_include@ -I../@apache_version_dir@ -I..
-
# ... and these two. We want to put the libs in the package path,
# rather than the standard library location for the system.
+
lib_libexecdir = @RIVET_TCL_TARGET@
lib_libexec_LTLIBRARIES = librivetparser.la
@@ -27,5 +26,5 @@ lib_libexec_LTLIBRARIES = librivetparser
librivetparser_la_SOURCES = rivetParser.c parserPkgInit.c
librivetparser_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
librivetparser_la_LIBADD = @APXS_LIBS@
-librivetparser_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+librivetparser_la_CPPFLAGS = @apache_include@ -I../@apache_version_dir@ -I.. @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org