From 30c74c6007bb0f9d9153fecc45208f2a1e811321 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 15 Jul 2014 11:37:19 -0400 Subject: [PATCH] build: more srcdir!=builddir fixes nm-version.h was getting disted, making srcdir!=builddir work for tarball builds, but not for git builds. Also, remove "-I${top_builddir}/include" from all Makefile.ams, since there's nothing generated in include/ any more. --- callouts/Makefile.am | 1 - callouts/tests/Makefile.am | 1 - cli/src/Makefile.am | 1 - examples/C/glib/Makefile.am | 1 - libnm-glib/Makefile.am | 1 - libnm-glib/tests/Makefile.am | 1 - libnm-util/Makefile.am | 7 ++++--- libnm-util/tests/Makefile.am | 1 - src/Makefile.am | 1 - src/config/tests/Makefile.am | 1 - src/devices/adsl/Makefile.am | 1 - src/devices/bluetooth/Makefile.am | 1 - src/devices/team/Makefile.am | 1 - src/devices/wifi/Makefile.am | 1 - src/devices/wifi/tests/Makefile.am | 1 - src/devices/wimax/Makefile.am | 1 - src/devices/wwan/Makefile.am | 1 - src/dhcp-manager/tests/Makefile.am | 1 - src/dnsmasq-manager/tests/Makefile.am | 1 - src/platform/tests/Makefile.am | 1 - src/ppp-manager/Makefile.am | 1 - src/rdisc/tests/Makefile.am | 2 +- src/settings/plugins/example/Makefile.am | 1 - src/settings/plugins/ifcfg-rh/Makefile.am | 1 - src/settings/plugins/ifcfg-rh/tests/Makefile.am | 1 - src/settings/plugins/ifcfg-suse/Makefile.am | 2 +- src/settings/plugins/ifnet/Makefile.am | 1 - src/settings/plugins/ifnet/tests/Makefile.am | 1 - src/settings/plugins/ifupdown/Makefile.am | 1 - src/settings/plugins/ifupdown/tests/Makefile.am | 1 - src/settings/plugins/keyfile/Makefile.am | 1 - src/settings/plugins/keyfile/tests/Makefile.am | 1 - src/settings/tests/Makefile.am | 2 +- src/supplicant-manager/tests/Makefile.am | 1 - src/tests/Makefile.am | 1 - test/Makefile.am | 1 - tui/Makefile.am | 1 - tui/newt/Makefile.am | 1 - 38 files changed, 7 insertions(+), 40 deletions(-) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index a8c9026fe7..3ec4581cad 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ $(GLIB_CFLAGS) \ diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index de4b5f5293..67af4d9d66 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -2,7 +2,6 @@ if ENABLE_TESTS AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I${top_builddir}/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/callouts \ diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 2dc67b5399..70dbd9795f 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_builddir} \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib \ diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am index 1f4785dad8..7289c50c41 100644 --- a/examples/C/glib/Makefile.am +++ b/examples/C/glib/Makefile.am @@ -3,7 +3,6 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index c43dab885c..57eff9a71a 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index b287147bcc..0bdd61a91a 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -2,7 +2,6 @@ if ENABLE_TESTS AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index cb08a14b4f..79c3706b85 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ -DG_LOG_DOMAIN=\""libnm-util"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ @@ -53,8 +52,10 @@ libnm_util_include_HEADERS = \ nm-setting-wireless.h \ nm-setting-wireless-security.h \ nm-setting-vpn.h \ + nm-utils.h + +nodist_libnm_util_include_HEADERS = \ nm-utils-enum-types.h \ - nm-utils.h \ nm-version.h libnm_util_la_private_headers = \ @@ -163,7 +164,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION -introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources) +introspection_sources = $(libnm_util_include_HEADERS) $(nodist_libnm_util_include_HEADERS) $(libnm_util_la_csources) NetworkManager-1.0.gir: libnm-util.la NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 6d3d225ef3..2b3366fcd7 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS=certs AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ diff --git a/src/Makefile.am b/src/Makefile.am index 244574af44..0a0b52dc0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,6 @@ endif AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I${top_srcdir}/libgsystem \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am index 6e64812b41..8d5a5b6d99 100644 --- a/src/config/tests/Makefile.am +++ b/src/config/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/config \ diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am index 0430f47d02..50024b3ee9 100644 --- a/src/devices/adsl/Makefile.am +++ b/src/devices/adsl/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/ppp-manager \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am index 639a1ad7a2..fa1a40fb74 100644 --- a/src/devices/bluetooth/Makefile.am +++ b/src/devices/bluetooth/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/devices/wwan \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am index e2bfd0a04a..f54de6ba2a 100644 --- a/src/devices/team/Makefile.am +++ b/src/devices/team/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/posix-signals \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am index 5f3ce286b7..211e38f43a 100644 --- a/src/devices/wifi/Makefile.am +++ b/src/devices/wifi/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/supplicant-manager \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am index 2667c5f12d..e90fd23043 100644 --- a/src/devices/wifi/tests/Makefile.am +++ b/src/devices/wifi/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/platform \ diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am index def8bf62b7..28a0758b2c 100644 --- a/src/devices/wimax/Makefile.am +++ b/src/devices/wimax/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/devices \ -I${top_srcdir}/src/platform \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am index 7e83f53224..b8c079eaf7 100644 --- a/src/devices/wwan/Makefile.am +++ b/src/devices/wwan/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/devices \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 6ef828d57f..4701b3f1b9 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ -I$(top_srcdir)/src/dhcp-manager \ diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index 9c7f4ab5c5..ac7bd000f1 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ -I$(top_srcdir)/src/dnsmasq-manager \ diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index 9b10ea7b2a..26d2476379 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -1,7 +1,6 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ -I${top_srcdir}/src \ -I${top_builddir}/src \ -I${top_srcdir}/src/logging \ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index a504a6a9fd..2d740f14a3 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,7 +1,6 @@ if WITH_PPP AM_CPPFLAGS = \ - -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index cf351d619a..27a55da878 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -1,13 +1,13 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I${top_srcdir}/src \ -I${top_srcdir}/src/devices \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/platform \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${srcdir}/.. \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am index 8233a71fdb..c91977eb70 100644 --- a/src/settings/plugins/example/Makefile.am +++ b/src/settings/plugins/example/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""NetworkManager-example"\" \ diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index c5e458af50..b3cdbb63ea 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -32,7 +32,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/posix-signals \ -I$(top_srcdir)/src/config \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index e758776da0..cd4dd76bc9 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ diff --git a/src/settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am index d4f1cf74d2..a9eef37239 100644 --- a/src/settings/plugins/ifcfg-suse/Makefile.am +++ b/src/settings/plugins/ifcfg-suse/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/settings \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-suse"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index a22ea557a5..1b317f6fdd 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index f66a6a3dd7..93f72214bc 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/config \ -I$(top_srcdir)/src/logging \ diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index fd98f8fe5c..ec4196e702 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/config \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index 160b332726..2967413fce 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -2,7 +2,6 @@ if ENABLE_TESTS AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index cac97e7fba..21e0cde9fc 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index fae6e4eaf1..7b148ca539 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS=keyfiles AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am index 4115d4bad3..5432724b48 100644 --- a/src/settings/tests/Makefile.am +++ b/src/settings/tests/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/settings \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ $(GLIB_CFLAGS) \ diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 9defe66b1b..6a32acddca 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 87310a252a..2370d57110 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/logging \ diff --git a/test/Makefile.am b/test/Makefile.am index 830019ba4c..f577d8a7dd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib \ -I${top_srcdir}/include \ - -I${top_builddir}/include \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ diff --git a/tui/Makefile.am b/tui/Makefile.am index 755b689412..7ca1b9196c 100644 --- a/tui/Makefile.am +++ b/tui/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = newt . AM_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 \ diff --git a/tui/newt/Makefile.am b/tui/newt/Makefile.am index 0db5525d04..e572238b2a 100644 --- a/tui/newt/Makefile.am +++ b/tui/newt/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -DG_LOG_DOMAIN=\""nmtui"\" \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \