summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in29
1 files changed, 12 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in
index 4249c9d2..b5d76338 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3231,14 +3231,11 @@ DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DHCLIENT_PATH = @DHCLIENT_PATH@
-DHCPCANON_PATH = @DHCPCANON_PATH@
-DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
-DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
+DNSSEC_TRIGGER_PATH = @DNSSEC_TRIGGER_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -3936,15 +3933,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \
 	Makefile.glib autogen.sh valgrind.suppressions meson.build \
 	meson_options.txt meson_post_install.py config.h.meson \
-	docs/meson.build po/meson.build shared/nm-common-macros.h \
-	shared/nm-dbus-compat.h shared/nm-default.h \
-	shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \
-	shared/nm-test-utils-impl.c shared/nm-utils/c-list-util.c \
-	shared/nm-utils/c-list-util.h shared/nm-utils/nm-c-list.h \
-	shared/nm-utils/nm-compat.c shared/nm-utils/nm-compat.h \
-	shared/nm-utils/nm-glib.h shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-io-utils.h shared/nm-utils/nm-jansson.h \
-	shared/nm-utils/nm-obj.h shared/nm-utils/nm-macros-internal.h \
+	config-extra.h.meson docs/meson.build po/meson.build \
+	shared/nm-common-macros.h shared/nm-dbus-compat.h \
+	shared/nm-default.h shared/nm-dispatcher-api.h \
+	shared/nm-test-libnm-utils.h shared/nm-test-utils-impl.c \
+	shared/nm-utils/c-list-util.c shared/nm-utils/c-list-util.h \
+	shared/nm-utils/nm-c-list.h shared/nm-utils/nm-compat.c \
+	shared/nm-utils/nm-compat.h shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-io-utils.c shared/nm-utils/nm-io-utils.h \
+	shared/nm-utils/nm-jansson.h shared/nm-utils/nm-obj.h \
+	shared/nm-utils/nm-macros-internal.h \
 	shared/nm-utils/nm-secret-utils.c \
 	shared/nm-utils/nm-secret-utils.h \
 	shared/nm-utils/nm-shared-utils.c \
@@ -17956,9 +17954,6 @@ config-extra.h: Makefile
 	echo "/* Generated by Makefile.am */"                    >$@ && \
 	echo "#define BINDIR            \"$(bindir)\""          >>$@ && \
 	echo "#define DATADIR           \"$(datadir)\""         >>$@ && \
-	echo "#define DHCLIENT_PATH     \"$(DHCLIENT_PATH)\""   >>$@ && \
-	echo "#define DHCPCANON_PATH    \"$(DHCPCANON_PATH)\""  >>$@ && \
-	echo "#define DHCPCD_PATH       \"$(DHCPCD_PATH)\""     >>$@ && \
 	echo "#define LIBEXECDIR        \"$(libexecdir)\""      >>$@ && \
 	echo "#define LOCALSTATEDIR     \"$(localstatedir)\""   >>$@ && \
 	echo "#define NMCONFDIR         \"$(nmconfdir)\""       >>$@ && \
@@ -18123,7 +18118,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 ###############################################################################
 
 src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
-	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
+	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
 
 $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)