[gnome-autoar] Use non-recursive Makefiles if possible

[Ting-Wei Lan <lantw src gnome org>]

commit c04b1ce6a1d6bca4b100b06076b923e5fc1ba1e7
Author: Ting-Wei Lan <lantw44 gmail com>
Date:   Sat Jan 18 15:41:41 2014 +0800

    Use non-recursive Makefiles if possible

 Makefile.am              |  127 ++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac             |    9 +--
 data/Makefile.am         |   12 ----
 gnome-autoar/Makefile.am |   68 ------------------------
 tests/Makefile.am        |   33 ------------
 5 files changed, 125 insertions(+), 124 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ec407d7..496d11a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,130 @@
 # vim: set sw=8 ts=8 sts=8 noet:
 
+NULL =
+
+# Global options
 ACLOCAL_AMFLAGS = -I m4
 
-NULL =
+EXTRA_DIST =
+BUILT_SOURCES =
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
 
-SUBDIRS = gnome-autoar data tests docs
+# Top-level directory
+EXTRA_DIST += autogen.sh
 
-EXTRA_DISTS = \
-       autogen.sh \
+
+# Directory: gnome-autoar
+EXTRA_DIST += \
+       gnome-autoar/autoar-enum-types.h.template       \
+       gnome-autoar/autoar-enum-types.c.template       \
+       gnome-autoar/gnome-autoar.pc.in                 \
        $(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+lib_LTLIBRARIES = gnome-autoar/libgnome-autoar.la
+
+libgnome_autoar_la_headers = \
+       gnome-autoar/autoar-common.h            \
+       gnome-autoar/autoar-create.h            \
+       gnome-autoar/autoar-extract.h           \
+       gnome-autoar/autoar-format-filter.h     \
+       gnome-autoar/autoar-gtk.h               \
+       gnome-autoar/autoar-pref.h              \
+       $(NULL)
+libgnome_autoar_la_sources = \
+       gnome-autoar/autoar-common.c            \
+       gnome-autoar/autoar-create.c            \
+       gnome-autoar/autoar-extract.c           \
+       gnome-autoar/autoar-format-filter.c     \
+       gnome-autoar/autoar-gtk.c               \
+       gnome-autoar/autoar-pref.c              \
+       $(NULL)
+libgnome_autoar_la_generated_files = \
+       gnome-autoar/autoar-enum-types.h        \
+       gnome-autoar/autoar-enum-types.c        \
+       $(NULL)
+
+BUILT_SOURCES += \
+       $(libgnome_autoar_la_generated_files)   \
+       $(NULL)
+
+autoarincludedir = $(includedir)/gnome-autoar
+autoarinclude_HEADERS = \
+       gnome-autoar/autoar.h                   \
+       $(libgnome_autoar_la_headers)           \
+       $(NULL)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnome-autoar/gnome-autoar.pc
+
+gnome_autoar_libgnome_autoar_la_SOURCES = \
+       $(libgnome_autoar_la_generated_files)   \
+       $(libgnome_autoar_la_headers)           \
+       $(libgnome_autoar_la_sources)           \
+       $(NULL)
+gnome_autoar_libgnome_autoar_la_CPPFLAGS = \
+       $(AM_CPPFLAGS)                          \
+       $(NULL)
+gnome_autoar_libgnome_autoar_la_CFLAGS = \
+       $(DEPENDENCIES_CFLAGS)                  \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)/gnome-autoar          \
+       $(AM_CFLAGS)                            \
+       $(NULL)
+
+gnome-autoar/autoar-enum-types.h: gnome-autoar/autoar-enum-types.h.template $(libgnome_autoar_la_headers)
+       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gnome-autoar/autoar-enum-types.h.template 
$(libgnome_autoar_la_headers) ) > $@
+gnome-autoar/autoar-enum-types.c: gnome-autoar/autoar-enum-types.c.template $(libgnome_autoar_la_headers)
+       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gnome-autoar/autoar-enum-types.c.template 
$(libgnome_autoar_la_headers) ) > $@
+
+
+# Directory: data
+gsettings_ENUM_NAMESPACE = org.gnome.desktop.archives
+gsettings_ENUM_FILES = $(top_srcdir)/gnome-autoar/autoar-format-filter.h
+
+gsettings_SCHEMAS = data/org.gnome.desktop.archives.gschema.xml
+EXTRA_DIST += $(gsettings_SCHEMAS)
+
+ GSETTINGS_RULES@
+
+
+# Directory: tests
+noinst_PROGRAMS = \
+       tests/test-extract      \
+       tests/test-pref         \
+       tests/test-create       \
+       tests/test-ui           \
+       $(NULL)
+
+test_cflags = \
+       $(DEPENDENCIES_CFLAGS)  \
+       -I$(top_srcdir)         \
+       $(AM_CFLAGS)            \
+       $(NULL)
+
+test_libs = \
+       $(top_builddir)/gnome-autoar/libgnome-autoar.la \
+       $(DEPENDENCIES_LIBS)    \
+       $(NULL)
+
+tests_test_extract_SOURCES = tests/test-extract.c
+tests_test_extract_CFLAGS = $(test_cflags)
+tests_test_extract_LDADD = $(test_libs)
+
+tests_test_pref_SOURCES = tests/test-pref.c
+tests_test_pref_CFLAGS = $(test_cflags)
+tests_test_pref_LDADD = $(test_libs)
+
+tests_test_create_SOURCES = tests/test-create.c
+tests_test_create_CFLAGS = $(test_cflags)
+tests_test_create_LDADD = $(test_libs)
+
+tests_test_ui_SOURCES = tests/test-ui.c
+tests_test_ui_CFLAGS = $(test_cflags)
+tests_test_ui_LDADD = $(test_libs)
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
+SUBDIRS = . docs
diff --git a/configure.ac b/configure.ac
index 47809e4..aa348db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([gnome-autoar/autoar.h])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar])
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar subdir-objects])
 AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -59,12 +59,9 @@ AC_C_INLINE
 AC_CHECK_FUNCS([getgrnam getpwnam link mkfifo mknod stat])
 
 AC_CONFIG_FILES([Makefile
-                 gnome-autoar/Makefile
-                 gnome-autoar/gnome-autoar.pc
-                 data/Makefile
-                 tests/Makefile
                  docs/Makefile
-                 docs/reference/Makefile])
+                 docs/reference/Makefile
+                 gnome-autoar/gnome-autoar.pc])
 AC_OUTPUT
 
 echo "