[network-manager-libreswan: 6/11] build: merge src/Makefile.am in toplevel makefile

[Thomas Haller <thaller src gnome org>]

commit 96ae0a22c2c101f9de684ae312eec970a3245911
Author: Thomas Haller <thaller redhat com>
Date:   Fri Feb 24 17:19:56 2017 +0100

    build: merge src/Makefile.am in toplevel makefile

 Makefile.am     |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac    |    2 +-
 src/Makefile.am |   86 -----------------------------------------
 3 files changed, 111 insertions(+), 90 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0e1f552..54a26de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 EXTRA_DIST =
 
@@ -13,10 +13,13 @@ ACLOCAL_AMFLAGS = -I m4
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES =
 
+noinst_LTLIBRARIES =
+
 libexec_PROGRAMS =
 
+noinst_PROGRAMS =
+
 SUBDIRS = \
-       src \
        po
 
 ###############################################################################
@@ -166,6 +169,110 @@ auth_dialog_nm_libreswan_auth_dialog_LDADD = \
 
 ###############################################################################
 
+src_cppflags = \
+       -DBINDIR=\"$(bindir)\" \
+       -DPREFIX=\""$(prefix)"\" \
+       -DLIBDIR=\""$(libdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\" \
+       -DLOCALSTATEDIR=\""$(localstatedir)"\" \
+       -DDATADIR=\"$(datadir)\" \
+       -DNM_LIBRESWAN_LOCALEDIR=\"$(datadir)/locale\" \
+       -I$(srcdir)/shared \
+       -I$(builddir)/src \
+       -I$(srcdir)/src \
+       $(GLIB_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNL_CFLAGS)
+
+src_shared_sources = \
+       shared/nm-utils/nm-shared-utils.c \
+       shared/nm-utils/nm-shared-utils.h \
+       shared/utils.c \
+       shared/utils.h \
+       shared/nm-service-defines.h \
+       $(NULL)
+
+###############################################################################
+
+# D-Bus stuff
+noinst_LTLIBRARIES += src/libnm-libreswan-helper-service-dbus.la
+
+nodist_src_libnm_libreswan_helper_service_dbus_la_SOURCES = \
+       src/nm-libreswan-helper-service-dbus.c \
+       src/nm-libreswan-helper-service-dbus.h
+
+src_libnm_libreswan_helper_service_dbus_la_CPPFLAGS = $(filter-out 
-DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags))
+
+src/nm-libreswan-helper-service-dbus.h: src/nm-libreswan-helper-service.xml
+       @$(MKDIR_P) src
+       $(AM_V_GEN) gdbus-codegen \
+               --generate-c-code $(basename $@) \
+               --c-namespace NMDBus \
+               --interface-prefix org.freedesktop.NetworkManager \
+               $<
+
+src/nm-libreswan-helper-service-dbus.c: src/nm-libreswan-helper-service-dbus.h
+       @true
+
+###############################################################################
+
+libexec_PROGRAMS += src/nm-libreswan-service
+
+src_nm_libreswan_service_SOURCES = \
+       $(src_shared_sources) \
+       src/nm-libreswan-service.c
+
+src_nm_libreswan_service_CPPFLAGS = \
+       $(src_cppflags)
+
+src_nm_libreswan_service_LDADD = \
+       src/libnm-libreswan-helper-service-dbus.la \
+       $(GLIB_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNL_LIBS) \
+       -lutil
+
+$(src_nm_libreswan_service_OBJECTS): src/nm-libreswan-helper-service-dbus.h
+
+###############################################################################
+
+libexec_PROGRAMS += src/nm-libreswan-service-helper
+
+src_nm_libreswan_service_helper_SOURCES = \
+       $(src_shared_sources) \
+       src/nm-libreswan-service-helper.c
+
+src_nm_libreswan_service_helper_CPPFLAGS = \
+       $(src_cppflags)
+
+src_nm_libreswan_service_helper_LDADD = \
+       src/libnm-libreswan-helper-service-dbus.la \
+       $(LIBNM_LIBS)
+
+$(src_nm_libreswan_service_helper_OBJECTS): src/nm-libreswan-helper-service-dbus.h
+
+###############################################################################
+
+noinst_PROGRAMS += src/show-xfrm
+
+src_show_xfrm_CPPFLAGS = \
+       $(src_cppflags)
+
+src_show_xfrm_LDADD = \
+       $(LIBNL_LIBS) \
+       $(GLIB_LIBS)
+
+###############################################################################
+
+CLEANFILES += \
+       src/nm-libreswan-helper-service-dbus.h \
+       src/nm-libreswan-helper-service-dbus.c
+
+EXTRA_DIST += \
+       src/nm-libreswan-helper-service.xml
+
+###############################################################################
+
 EXTRA_DIST += \
        shared/README \
        shared/nm-utils/gsystem-local-alloc.h \
@@ -188,7 +295,7 @@ if WITH_LIBNM_GLIB
 # Install a file with full path to plugins for an old gnome-shell
 # https://bugzilla.gnome.org/show_bug.cgi?id=693590
 install-data-hook:
-       mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
+       @$(MKDIR_P) $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
        sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
            -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[@]PLUGINDIR[@]|@NM_PLUGIN_DIR@|g' \
diff --git a/configure.ac b/configure.ac
index 7d01724..3dc753f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 dnl
 dnl Required headers
@@ -159,7 +160,6 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT