[network-manager-openvpn: 7/14] build: merge auth-dialog/Makefile.am in top-level Makefile.am



commit 42ebbfac9728d38062cc2c25f5ff9fa41fe61035
Author: Thomas Haller <thaller redhat com>
Date:   Sun Feb 12 10:27:55 2017 +0100

    build: merge auth-dialog/Makefile.am in top-level Makefile.am

 Makefile.am             |   36 ++++++++++++++++++++++++++++++++----
 auth-dialog/Makefile.am |   26 --------------------------
 configure.ac            |    1 -
 3 files changed, 32 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5379d01..5822d16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,6 @@ SUBDIRS = \
        . \
        po
 
-if WITH_GNOME
-SUBDIRS += auth-dialog
-endif
-
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES =
 
@@ -299,6 +295,38 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+if WITH_GNOME
+libexec_PROGRAMS += auth-dialog/nm-openvpn-auth-dialog
+endif
+
+auth_dialog_nm_openvpn_auth_dialog_CPPFLAGS = \
+       -DICONDIR=\""$(datadir)/pixmaps"\" \
+       -DUIDIR=\""$(uidir)"\" \
+       -DBINDIR=\""$(bindir)"\" \
+       -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+       -I$(srcdir)/shared \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
+       $(LIBSECRET_CFLAGS)
+
+auth_dialog_nm_openvpn_auth_dialog_SOURCES = \
+       shared/utils.c \
+       shared/utils.h \
+       auth-dialog/main.c
+
+auth_dialog_nm_openvpn_auth_dialog_LDADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS) \
+       $(LIBSECRET_LIBS)
+
+CLEANFILES += \
+       auth-dialog/*~
+
+###############################################################################
+
 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
diff --git a/configure.ac b/configure.ac
index 2327fc5..f81030c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-auth-dialog/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]