[network-manager-applet/th/build-non-recursive-make-bgo778400: 6/18] build: merge src/utils/Makefile.am in toplevel Makefile.am

[Thomas Haller <thaller src gnome org>]

commit 47165d3860b1a2b93b451e910605c9137dacb851
Author: Thomas Haller <thaller redhat com>
Date:   Thu Feb 9 12:18:31 2017 +0100

    build: merge src/utils/Makefile.am in toplevel Makefile.am

 Makefile.am                 |   87 ++++++++++++++++++++++++++++++++++++++++--
 configure.ac                |    2 -
 src/Makefile.am             |    2 +-
 src/utils/Makefile.am       |   39 -------------------
 src/utils/tests/Makefile.am |   16 --------
 5 files changed, 83 insertions(+), 63 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 141dd45..7fc858e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,27 @@ include $(GLIB_MAKEFILE)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+noinst_LTLIBRARIES =
+
+noinst_PROGRAMS =
+
+check_PROGRAMS =
+
+check_programs =
+
+TESTS =
+
 EXTRA_DIST =
 
+CLEANFILES =
+
+DISTCLEANFILES =
+
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-more-warnings=yes
+
 SUBDIRS = \
+       . \
        src \
        po \
        man \
@@ -110,6 +128,68 @@ EXTRA_DIST += $(iconscalable_DATA)
 
 ###############################################################################
 
+shared_files = \
+       shared/nm-utils/nm-shared-utils.c \
+       shared/nm-utils/nm-shared-utils.h \
+       $(NULL)
+
+
+noinst_LTLIBRARIES += src/utils/libutils-libnm.la
+
+src_utils_libutils_libnm_la_CPPFLAGS = \
+       "-I$(srcdir)/shared" \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+src_utils_libutils_libnm_la_SOURCES = \
+       $(shared_files) \
+       src/utils/utils.c \
+       src/utils/utils.h
+
+src_utils_libutils_libnm_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS)
+
+
+noinst_LTLIBRARIES += src/utils/libutils-libnm-glib.la
+
+src_utils_libutils_libnm_glib_la_CPPFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
+       "-I$(srcdir)/shared" \
+       $(GTK_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS)
+
+src_utils_libutils_libnm_glib_la_SOURCES = \
+       $(shared_files) \
+       src/utils/utils.c \
+       src/utils/utils.h
+
+src_utils_libutils_libnm_glib_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_GLIB_LIBS)
+
+
+check_programs += src/utils/tests/test-utils
+
+src_utils_tests_test_utils_SOURCES = src/utils/tests/test-utils.c
+
+src_utils_tests_test_utils_CPPFLAGS = \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/utils" \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+src_utils_tests_test_utils_LDADD = \
+       src/utils/libutils-libnm.la \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS)
+
+###############################################################################
+
+check_PROGRAMS += $(check_programs)
+
+TESTS += $(check_programs)
+
 EXTRA_DIST += \
        CONTRIBUTING \
        intltool-extract.in \
@@ -141,22 +221,19 @@ appdata_in_files = nm-connection-editor.appdata.xml.in
 convertdir=$(datadir)/GConf/gsettings
 convert_DATA=nm-applet.convert
 
-DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-more-warnings=yes
-
 EXTRA_DIST += \
        $(convert_DATA) \
        $(appdata_in_files) \
        $(autostart_in_files) \
        $(desktop_in_files)
 
-CLEANFILES = \
+CLEANFILES += \
        $(autostart_DATA) \
        $(desktop_DATA) \
        $(appdata_DATA) \
        $(BUILT_SOURCES)
 
-DISTCLEANFILES = \
+DISTCLEANFILES += \
        intltool-extract \
        intltool-merge \
        intltool-update
diff --git a/configure.ac b/configure.ac
index ba05a2c..341f7d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,8 +171,6 @@ src/libnm-gtk/examples/Makefile
 src/libnm-gtk/libnm-gtk.pc
 src/libnma/Makefile
 src/libnma/libnma.pc
-src/utils/Makefile
-src/utils/tests/Makefile
 src/wireless-security/Makefile
 src/connection-editor/Makefile
 po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 255020d..968a7c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils wireless-security libnm-gtk libnma connection-editor
+SUBDIRS = wireless-security libnm-gtk libnma connection-editor
 
 bin_PROGRAMS = nm-applet