[SCM] frei0r/master: Disabled subdir-objects

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f78ff7e20e4413ba00d180f46e29f40da7cf8ed6
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue May 20 15:45:11 2014 +0200

    Disabled subdir-objects
    
    it breaks build, as somehow C-files have a higher priority as C++-files

diff --git a/debian/patches/1-AM_INIT_AUTOMAKE.patch b/debian/patches/1-AM_INIT_AUTOMAKE.patch
index 0c504aa..2f45ba0 100644
--- a/debian/patches/1-AM_INIT_AUTOMAKE.patch
+++ b/debian/patches/1-AM_INIT_AUTOMAKE.patch
@@ -1,7 +1,6 @@
 Description: fix args to AM_INIT_AUTOMAKE
- arguments to AM_INIT_AUTOMAKE have a new meaning.
+ arguments to AM_INIT_AUTOMAKE have been deprecated.
  see http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
- we use it to enable subdir-objects (else we get loads of warnings)
 Author: IOhannes m zmölnig
 Last-Update: 2014-05-20
 ---
@@ -13,7 +12,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  AC_CONFIG_MACRO_DIR([m4])
  
 -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-+AM_INIT_AUTOMAKE([subdir-objects])
++AM_INIT_AUTOMAKE
  
  # Checks for programs.
  AC_PROG_CXX

-- 
frei0r packaging