[GNUnet-SVN] [gnunet] branch master updated (6b2f72df1 -> 7348fad86)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 6b2f72df1 boostrap: Add check for libtool, libtoolize or glibtoolize. 
This *seems* to be enough to fix the complains autoconf throws at us.
     new 4a3f7e1ce contrib/Makefile.am: Use more portable Suffixes Extensions.
     new 7348fad86 Use Suffix Extensions in Makefiles (doc, 
src/{arm,dht,integration,statistics}) for improved portability.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/Makefile.am               | 15 ++++++++++++++-
 doc/Makefile.am                   |  1 +
 src/arm/Makefile.am               |  3 ++-
 src/dht/Makefile.am               |  3 ++-
 src/integration-tests/Makefile.am |  3 ++-
 src/statistics/Makefile.am        |  3 ++-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 07cff424c..ac8b15188 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -70,7 +70,20 @@ CLEANFILES = \
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
 
-%.py: %.py.in Makefile
+# Use SUFFIX Extension rules, they are more portable for every
+# implementation of 'make'.
+# You'll also run into the "'%' is a GNU make extension warning"
+# if you use this:
+#
+#%.py: %.py.in Makefile
+#      $(do_subst) < $< > $@
+#      chmod +x $@
+#
+# instead of this:
+
+SUFFIXES = .py.in .py
+
+.py.in.py:
        $(do_subst) < $< > $@
        chmod +x $@
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1a8bb64b9..d9a68d533 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -150,6 +150,7 @@ lego_stack.png: images/lego_stack.svg
        convert images/lego_stack.svg images/lego_stack.png &&
        pngcrush images/lego_stack.png images/lego_stack.png
 
+# FIXME: The usage of 'date' strings causes a warning.
 version.texi:
        echo "@set UPDATED $(date +'%d %B %Y')" > $@
        echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 373847fde..b1706a479 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -92,7 +92,8 @@ test_gnunet_service_arm_SOURCES = \
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
 
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 00ce0e934..4a78ea4c7 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -213,7 +213,8 @@ endif
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g' -e 
's,address@hidden@],$(bindir),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
 
diff --git a/src/integration-tests/Makefile.am 
b/src/integration-tests/Makefile.am
index 6fff0b407..368980064 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -42,7 +42,8 @@ endif
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
 
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index b2e256960..16a1ea2d0 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -90,7 +90,8 @@ endif
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden