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 --- cli/Makefile.in | 2 ++ cli/completion/Makefile.in | 2 ++ cli/src/Makefile.am | 12 +++++------- cli/src/Makefile.in | 14 +++++++------- 4 files changed, 16 insertions(+), 14 deletions(-) (limited to 'cli') diff --git a/cli/Makefile.in b/cli/Makefile.in index f2559343..dd649e36 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -211,6 +211,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@ @@ -233,6 +234,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@ diff --git a/cli/completion/Makefile.in b/cli/completion/Makefile.in index 21dec8a7..62cd8b59 100644 --- a/cli/completion/Makefile.in +++ b/cli/completion/Makefile.in @@ -182,6 +182,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@ @@ -204,6 +205,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@ diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 0f379c10..1cd2a006 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -1,13 +1,16 @@ bin_PROGRAMS = \ nmcli -INCLUDES = \ +nmcli_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-glib + -I${top_srcdir}/libnm-glib \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ common.c \ @@ -25,11 +28,6 @@ nmcli_SOURCES = \ utils.c \ utils.h -nmcli_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" - nmcli_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index ef2add85..46846571 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -209,6 +209,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@ @@ -231,6 +232,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@ @@ -415,13 +417,16 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -INCLUDES = \ +nmcli_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-glib + -I${top_srcdir}/libnm-glib \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ common.c \ @@ -439,11 +444,6 @@ nmcli_SOURCES = \ utils.c \ utils.h -nmcli_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" - nmcli_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ -- cgit 1.3.0-6-gf8a5