[gnome-commander] Revert "Compile source files in the relative sub-directories, fixes automake warning"

[Uwe Scholz <uwescholz src gnome org>]

commit 7e97adc32610ca1814e46adb30739b5773521d79
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun Sep 24 21:58:23 2017 +0200

    Revert "Compile source files in the relative sub-directories, fixes automake warning"
    
    This reverts commit afc9c8f, as it breaks `make distcheck` and will be
    fixed in automake 1.16, which I currently don't have locally installed.
    
    See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928
    
    I will re-revert this commit again when I have automake-1.16 available.

 configure.ac      |    2 +-
 tests/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f768e09..773e414 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([gnome-commander],[1.7.0],[http://bugzilla.gnome.org/enter_bug.cgi?produ
 AC_CONFIG_SRCDIR(src/gnome-cmd-includes.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 
 YELP_HELP_INIT
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 79aa536..230b325 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -93,7 +93,7 @@ iv_datapresentation_CXXFLAGS = $(AM_CPPFLAGS)
 iv_datapresentation_LDFLAGS = $(INTVLIBS)
 iv_datapresentation_LDADD = $(ADDITIONAL_LDADD)
 
-utils_no_dependencies_SOURCES = utils_no_dependencies_tests.cc ../src/utils-no-dependencies.cc 
gcmd_tests_main.cc
+utils_no_dependencies_SOURCES = utils_no_dependencies_tests.cc $(top_srcdir)/src/utils-no-dependencies.cc 
gcmd_tests_main.cc
 utils_no_dependencies_CXXFLAGS = $(AM_CPPFLAGS)
 utils_no_dependencies_LDFLAGS = $(GCMD_LIBS)
 utils_no_dependencies_LDADD = $(ADDITIONAL_LDADD)