[network-manager-libreswan: 5/11] build: merge auth-dialog/Makefile.am in toplevel makefile

[Thomas Haller <thaller src gnome org>]

commit d480e8120e69d88bf24cecef772082a596d989ea
Author: Thomas Haller <thaller redhat com>
Date:   Fri Feb 24 17:10:40 2017 +0100

    build: merge auth-dialog/Makefile.am in toplevel makefile

 Makefile.am             |   32 ++++++++++++++++++++++++++++----
 auth-dialog/Makefile.am |   30 ------------------------------
 configure.ac            |    1 -
 3 files changed, 28 insertions(+), 35 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5047ae8..0e1f552 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,12 @@ ACLOCAL_AMFLAGS = -I m4
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES =
 
+libexec_PROGRAMS =
+
 SUBDIRS = \
        src \
        po
 
-if WITH_GNOME
-SUBDIRS += auth-dialog
-endif
-
 ###############################################################################
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
@@ -142,6 +140,32 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+if WITH_GNOME
+libexec_PROGRAMS += auth-dialog/nm-libreswan-auth-dialog
+endif
+
+auth_dialog_nm_libreswan_auth_dialog_CPPFLAGS = \
+       -DICONDIR=\""$(datadir)/pixmaps"\" \
+       -DBINDIR=\""$(bindir)"\" \
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+       -I$(srcdir)/shared \
+       $(GLIB_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBSECRET_CFLAGS)
+
+auth_dialog_nm_libreswan_auth_dialog_SOURCES = \
+       auth-dialog/main.c
+
+auth_dialog_nm_libreswan_auth_dialog_LDADD = \
+       $(LIBNM_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBNMA_LIBS) \
+       $(LIBSECRET_LIBS)
+
+###############################################################################
+
 EXTRA_DIST += \
        shared/README \
        shared/nm-utils/gsystem-local-alloc.h \
diff --git a/configure.ac b/configure.ac
index e55942b..7d01724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,6 @@ fi
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-auth-dialog/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT