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 2017/01/18 17:23:44 UTC
svn commit: r1779358 - in /tcl/rivet/trunk: ChangeLog Makefile.in
doc/Makefile.am src/Makefile.am
Author: mxmanghi
Date: Wed Jan 18 17:23:43 2017
New Revision: 1779358
URL: http://svn.apache.org/viewvc?rev=1779358&view=rev
Log:
* doc/Makefile.am: integration of the automake
infrastructure and rules
* src/Makefile.am: removed prefixing of
library names with DESTDIR
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/doc/Makefile.am
tcl/rivet/trunk/src/Makefile.am
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1779358&r1=1779357&r2=1779358&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Wed Jan 18 17:23:43 2017
@@ -1,3 +1,9 @@
+2017-01-18 Massimo Manghi <mx...@apache.org>
+ * doc/Makefile.am: integration of the automake
+ infrastructure and rules
+ * src/Makefile.am: removed prefixing of
+ library names with DESTDIR
+
2017-01-17 Massimo Manghi <mx...@apache.org>
* Makefile.am: removing the mpm shared library
directory only if exists (it's removed by
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1779358&r1=1779357&r2=1779358&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Wed Jan 18 17:23:43 2017
@@ -17,7 +17,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1779042 2017-01-16 15:29:36Z mxmanghi $
+# $Id: Makefile.am 1779155 2017-01-17 09:16:29Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
Modified: tcl/rivet/trunk/doc/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/Makefile.am?rev=1779358&r1=1779357&r2=1779358&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/Makefile.am (original)
+++ tcl/rivet/trunk/doc/Makefile.am Wed Jan 18 17:23:43 2017
@@ -18,45 +18,48 @@
.PHONY: clean
-MANDIRS = html/ html/images
+MANDIRS = $(srcdir)/html/ $(srcdir)/html/images
+
PICTURES:=$(wildcard images/*.png)
EXAMPLES_SGML:=$(wildcard examples-sgml/*.*)
EXAMPLES:=$(wildcard examples/*.*)
# English, multiple files.
-html/index.html: rivet.xml rivet-chunk.xsl rivet.xsl xml/*.xml
+$(buildir)/html/index.html: $(srcdir)/rivet.xml $(srcdir)/rivet-chunk.xsl $(srcdir)/rivet.xsl $(srcdir)/xml/*.xml
xsltproc --stringparam html.stylesheet rivet.css \
--stringparam html.ext ".html" \
--stringparam chunker.output.encoding UTF-8 \
- --nonet -o html/ rivet-chunk.xsl rivet.xml
+ --nonet -o $(builddir)/html/ $(srcdir)/rivet-chunk.xsl $(srcdir)/rivet.xml
# English, one big file.
-html/rivet.html: rivet.xml rivet-nochunk.xsl rivet.xsl xml/*.xml
+$(buildir)/html/rivet.html: $(srcdir)/rivet.xml $(srcdir)/rivet-nochunk.xsl $(srcdir)/rivet.xsl $(srcdir)/xml/*.xml
xsltproc --stringparam html.stylesheet rivet.css \
--stringparam html.ext ".html" \
--stringparam chunker.output.encoding UTF-8 \
- --nonet -o html/rivet.html rivet-nochunk.xsl \
- rivet.xml
+ --nonet -o $(builddir)/html/rivet.html $(srcdir)/rivet-nochunk.xsl \
+ $(srcdir)/rivet.xml
# This means these are not build automatically, but at least
# people aren't forced to build them either.
-docs: picts html/rivet.css html/index.html
+docs: $(buildir)/html/rivet.css $(buildir)/html/index.html picts
-docs-nochunk: picts html/rivet.css html/rivet.html
+docs-nochunk: html/rivet.css html/rivet.html picts
-html/rivet.css: mandirs rivet.css
- cp -v rivet.css html/
+$(buildir)/html/rivet.css: rivet.css
+ $(mkinstalldirs) $(builddir)/html
+ $(install_sh) -C -m 644 $(srcdir)/rivet.css $(builddir)/html/
# target picts checks the directory tree exists, then lets target 'graphics' copy new
# or updated files to the target tree.
-picts: mandirs graphics
+picts: graphics
graphics: $(PICTURES)
- for gfile in $?; do \
- cp -v $$gfile html/images/ ; \
- done ; \
+ $(mkinstalldirs) $(builddir)/html/images
+ @for gfile in $?; do \
+ $(install_sh) -C -m 644 $(srcdir)/$$gfile $(builddir)/html/images/ ; \
+ done
touch graphics
examples:
@@ -70,11 +73,13 @@ mandirs: $(MANDIRS)
$(MANDIRS):
mkdir $@
+install-data-local: docs
+
# this target cleans everything up in the html directory
distclean:
- -rm -fr html/*.html
- -rm -f graphics
+ -rm -fr $(builddir)/html/
+ -rm -f $(builddir)/graphics
-rm Makefile
uninstall-local:
Modified: tcl/rivet/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/Makefile.am?rev=1779358&r1=1779357&r2=1779358&view=diff
==============================================================================
--- tcl/rivet/trunk/src/Makefile.am (original)
+++ tcl/rivet/trunk/src/Makefile.am Wed Jan 18 17:23:43 2017
@@ -16,7 +16,7 @@
#SUBDIRS = @rivet_core@
-lib_libexecdir = $(DESTDIR)@RIVET_TCL_TARGET@
+lib_libexecdir = @RIVET_TCL_TARGET@
lib_libexec_LTLIBRARIES = librivetparser.la librivetlib.la
#
@@ -35,7 +35,7 @@ librivetlib_la_LDFLAGS = @TCL_STUB_LIB_S
librivetlib_la_LIBADD = @APXS_LIBS@
librivetlib_la_CPPFLAGS = -I$(srcdir)/@rivet_core@ -I$(srcdir)/@apache_request@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
-apxs_libexecdir = $(DESTDIR)@APXS_LIBEXECDIR@
+apxs_libexecdir = @APXS_LIBEXECDIR@
apxs_libexec_LTLIBRARIES = mod_rivet.la
mod_rivet_la_SOURCES = @rivet_core@/mod_rivet.c \
@@ -68,7 +68,7 @@ mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @A
mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
mod_rivet_la_CPPFLAGS = -I$(srcdir) -I$(srcdir)/@rivet_core@ -I$(srcdir)/@rivet_channel@ -I$(srcdir)/parser -I$(srcdir)/@apache_request@ @apache_include@ -I. @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
-lib_libmpmdir = $(DESTDIR)@RIVET_TCL_TARGET@/mpm
+lib_libmpmdir = @RIVET_TCL_TARGET@/mpm
lib_libmpm_LTLIBRARIES = rivet_worker_mpm.la rivet_prefork_mpm.la rivet_lazy_mpm.la
rivet_worker_mpm_la_SOURCES = @rivet_core@/rivet_worker_mpm.c @rivet_core@/worker_prefork_common.c
@@ -89,13 +89,13 @@ rivet_lazy_mpm_la_CPPFLAGS = @apache_inc
# Removing libtool .la files from installation
install-data-hook:
- echo 'target install-data-hook: removing unwanted libtool .la files'
+ echo 'target install-data-hook: removing unwanted libtool .la files from $(lib_libexecdir) $(apxs_libexecdir) $(lib_libmpmdir)'
rm -f $(DESTDIR)$(lib_libexecdir)/*.la
rm -f $(DESTDIR)$(apxs_libexecdir)/*.la
rm -f $(DESTDIR)$(lib_libmpmdir)/*.la
uninstall:
- echo 'target uninstall: removing mod_rivet.so module'
+ echo 'target uninstall: removing shared libraries from $(lib_libexecdir) $(apxs_libexecdir) $(lib_libmpmdir)'
rm -f $(DESTDIR)$(lib_libmpmdir)/*.so
rm -f $(DESTDIR)$(lib_libexecdir)/*.so
rm -f $(DESTDIR)$(apxs_libexecdir)/mod_rivet.so
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org