From 59c3714a494c3b3765657c0551ad82842d98a7d2 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 26 Apr 2014 20:55:09 +0200 Subject: Imported Upstream version 0.9.8.10 --- src/supplicant-manager/Makefile.am | 18 ++++++++---------- src/supplicant-manager/Makefile.in | 18 +++++++++--------- src/supplicant-manager/tests/Makefile.am | 14 ++++++-------- src/supplicant-manager/tests/Makefile.in | 12 ++++++------ 4 files changed, 29 insertions(+), 33 deletions(-) (limited to 'src/supplicant-manager') diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index 74ec9c38..a4d2f250 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = . tests -INCLUDES = \ +noinst_LTLIBRARIES = libsupplicant-manager.la + +libsupplicant_manager_la_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ @@ -8,9 +10,11 @@ INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util - -noinst_LTLIBRARIES = libsupplicant-manager.la + -I${top_srcdir}/libnm-util \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ + -DNM_LOCALSTATEDIR=\"$(localstatedir)\" libsupplicant_manager_la_SOURCES = \ nm-supplicant-types.h \ @@ -23,12 +27,6 @@ libsupplicant_manager_la_SOURCES = \ nm-supplicant-settings-verify.h \ nm-supplicant-settings-verify.c -libsupplicant_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ - -DNM_LOCALSTATEDIR=\"$(localstatedir)\" - libsupplicant_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ $(DBUS_LIBS) \ diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in index 21fb2e47..6a46202a 100644 --- a/src/supplicant-manager/Makefile.in +++ b/src/supplicant-manager/Makefile.in @@ -251,6 +251,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -458,7 +460,8 @@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ SUBDIRS = . tests -INCLUDES = \ +noinst_LTLIBRARIES = libsupplicant-manager.la +libsupplicant_manager_la_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ @@ -466,9 +469,12 @@ INCLUDES = \ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util + -I${top_srcdir}/libnm-util \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ + -DNM_LOCALSTATEDIR=\"$(localstatedir)\" -noinst_LTLIBRARIES = libsupplicant-manager.la libsupplicant_manager_la_SOURCES = \ nm-supplicant-types.h \ nm-supplicant-manager.h \ @@ -480,12 +486,6 @@ libsupplicant_manager_la_SOURCES = \ nm-supplicant-settings-verify.h \ nm-supplicant-settings-verify.c -libsupplicant_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ - -DNM_LOCALSTATEDIR=\"$(localstatedir)\" - libsupplicant_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ $(DBUS_LIBS) \ diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 20ba9cc5..58132a60 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -1,22 +1,20 @@ if ENABLE_TESTS -INCLUDES = \ +noinst_PROGRAMS = test-supplicant-config + +test_supplicant_config_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/supplicant-manager - -noinst_PROGRAMS = test-supplicant-config + -I$(top_srcdir)/src/supplicant-manager \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) test_supplicant_config_SOURCES = \ test-supplicant-config.c -test_supplicant_config_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_supplicant_config_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \ diff --git a/src/supplicant-manager/tests/Makefile.in b/src/supplicant-manager/tests/Makefile.in index dcd90d61..11dc6d5c 100644 --- a/src/supplicant-manager/tests/Makefile.in +++ b/src/supplicant-manager/tests/Makefile.in @@ -207,6 +207,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -229,6 +230,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -413,21 +415,19 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -@ENABLE_TESTS_TRUE@INCLUDES = \ +@ENABLE_TESTS_TRUE@test_supplicant_config_CPPFLAGS = \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/include \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/include \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-util \ @ENABLE_TESTS_TRUE@ -I$(top_builddir)/libnm-util \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \ -@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/supplicant-manager +@ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src/supplicant-manager \ +@ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) @ENABLE_TESTS_TRUE@test_supplicant_config_SOURCES = \ @ENABLE_TESTS_TRUE@ test-supplicant-config.c -@ENABLE_TESTS_TRUE@test_supplicant_config_CPPFLAGS = \ -@ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ -@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) - @ENABLE_TESTS_TRUE@test_supplicant_config_LDADD = \ @ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ @ENABLE_TESTS_TRUE@ $(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \ -- cgit 1.3.0-6-gf8a5