[pktools] 07/07: Add patch to set subdir-objects automake option for forward compatibility.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository pktools.

commit a6a0be7f4b3f62c31d95e989dcf6f48fc0e6c5e7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 8 01:06:32 2014 +0200

    Add patch to set subdir-objects automake option for forward compatibility.
---
 debian/changelog                             |  1 +
 debian/patches/automake-subdir-objects.patch | 11 +++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d14c83a..2aac1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ pktools (2.5.2+20140505-2) UNRELEASED; urgency=medium
   * Fix duplicate short description.
   * Add patch to fix 'bandwidth' typo.
   * Use dh-autoreconf for retooling.
+  * Add patch to set subdir-objects automake option for forward compatibility.
 
  -- Ross Gammon <rossgammon at mail.dk>  Mon, 04 Aug 2014 23:29:02 +0200
 
diff --git a/debian/patches/automake-subdir-objects.patch b/debian/patches/automake-subdir-objects.patch
new file mode 100644
index 0000000..c4c9bdf
--- /dev/null
+++ b/debian/patches/automake-subdir-objects.patch
@@ -0,0 +1,11 @@
+Description: Remain forward compatible with automake using subdir-objects.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+
+--- a/src/apps/Makefile.am
++++ b/src/apps/Makefile.am
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(GDAL_CFLAGS) @AM_CXXFLAGS@
+ AM_LDFLAGS = $(GSL_LIBS) $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la $(top_builddir)/src/base/libbase.la @AM_LDFLAGS@
+ LDADD = $(GSL_LIBS) $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la $(top_builddir)/src/base/libbase.la
diff --git a/debian/patches/series b/debian/patches/series
index dca18d6..0cdaa8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 bandwidth-typo.patch
+automake-subdir-objects.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git