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

[Thomas Haller <thaller src gnome org>]

commit 07f40695a560fb8312a60a365ac8126b9b03b27b
Author: Thomas Haller <thaller redhat com>
Date:   Thu Feb 9 15:36:19 2017 +0100

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

 Makefile.am            |   87 ++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac           |    1 -
 src/Makefile.am        |    2 +-
 src/libnma/Makefile.am |   90 ------------------------------------------------
 4 files changed, 88 insertions(+), 92 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1671109..e07ddf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -422,6 +422,93 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+BUILT_SOURCES += \
+       src/libnma/nma-resources.h \
+       src/libnma/nma-resources.c
+
+src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma 
--generate-header --internal
+
+src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma 
--generate-source --internal
+
+
+src_libnma_libnmadir = $(includedir)/libnma
+
+src_libnma_libnma_HEADERS = \
+       src/libnma/nma-wifi-dialog.h \
+       src/libnma/nma-mobile-wizard.h \
+       src/libnma/nma-mobile-providers.h \
+       src/libnma/nma-vpn-password-dialog.h \
+       src/libnma/nma-ui-utils.h
+
+
+lib_LTLIBRARIES += src/libnma/libnma.la
+
+src_libnma_libnma_la_SOURCES = \
+       src/libnma/nma-resources.h \
+       src/libnma/nma-resources.c \
+       \
+       src/libnma/nma-wifi-dialog.c \
+       src/libnma/nma-mobile-wizard.c \
+       src/libnma/nma-mobile-providers.c \
+       src/libnma/nma-vpn-password-dialog.c \
+       src/libnma/nma-ui-utils.c \
+       src/libnma/init.c
+
+src_libnma_libnma_la_CFLAGS = \
+       -DICONDIR=\""$(datadir)/icons"\" \
+       -DBINDIR=\""$(bindir)"\" \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\" \
+       -DDATADIR=\""$(datadir)"\" \
+       -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
+       -DNMALOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       "-I$(srcdir)/shared" \
+       "-I$(srcdir)/src/utils" \
+       "-I$(srcdir)/src/wireless-security" \
+       "-I$(srcdir)/src/libnma" \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(GUDEV_CFLAGS)
+
+src_libnma_libnma_la_LIBADD = \
+       src/wireless-security/libwireless-security-libnm.la \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(GUDEV_LIBS)
+
+EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
+
+src_libnma_libnma_la_LDFLAGS = \
+       -Wl,-no-undefined \
+       -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
+
+
+pkgconfig_DATA += src/libnma/libnma.pc
+
+if HAVE_INTROSPECTION
+src/libnma/NMA-1.0.gir: src/libnma/libnma.la
+src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
+src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
+src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
+src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
+src_libnma_NMA_1_0_gir_FILES = \
+       $(src_libnma_libnma_HEADERS) \
+       $(src_libnma_libnma_la_SOURCES)
+src_libnma_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += src/libnma/NMA-1.0.gir
+endif
+
+EXTRA_DIST += \
+       src/libnma/libnma.pc.in \
+       src/libnma/libnma.ver \
+       src/libnma/wifi.ui \
+       src/libnma/nma.gresource.xml
+
+###############################################################################
+
 check_PROGRAMS += $(check_programs)
 
 check-local: $(check_local)
diff --git a/configure.ac b/configure.ac
index 11fe845..e9fca3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,6 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/libnm-gtk/libnm-gtk.pc
-src/libnma/Makefile
 src/libnma/libnma.pc
 src/connection-editor/Makefile
 po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 7bf709d..008f2f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libnma connection-editor
+SUBDIRS = connection-editor
 
 bin_PROGRAMS = nm-applet