Commit aa0c7d86 authored by Pavel Šimerda's avatar Pavel Šimerda
Browse files

build: srcdir != builddir issues in plugins

parent 2a900e2d
...@@ -10,6 +10,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \ ...@@ -10,6 +10,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
-I${top_srcdir}/src/settings \ -I${top_srcdir}/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-DSYSCONFDIR=\"$(sysconfdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
......
...@@ -4,8 +4,10 @@ INCLUDES = \ ...@@ -4,8 +4,10 @@ INCLUDES = \
-I$(top_srcdir)/src/wifi \ -I$(top_srcdir)/src/wifi \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util
pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
......
...@@ -3,12 +3,19 @@ if ENABLE_TESTS ...@@ -3,12 +3,19 @@ if ENABLE_TESTS
INCLUDES=-I$(srcdir)/../ \ INCLUDES=-I$(srcdir)/../ \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/src/settings -I$(top_srcdir)/src/settings
TESTS = check_ifnet TESTS = check_ifnet
check_PROGRAMS = check_ifnet check_PROGRAMS = check_ifnet
check_ifnet_SOURCES = test_all.c check_ifnet_SOURCES = test_all.c
check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
check_ifnet_CPPFLAGS = \
$(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \
-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \ check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
$(builddir)/../lib-ifnet-io.la \ $(builddir)/../lib-ifnet-io.la \
$(CHECK_LIBS) \ $(CHECK_LIBS) \
......
...@@ -436,7 +436,7 @@ main (void) ...@@ -436,7 +436,7 @@ main (void)
ifnet_destroy (); ifnet_destroy ();
wpa_parser_destroy (); wpa_parser_destroy ();
ifnet_init ("net"); ifnet_init ("net");
wpa_parser_init ("wpa_supplicant.conf"); wpa_parser_init (TEST_WPA_SUPPLICANT_CONF);
printf ("Initialization complete\n"); printf ("Initialization complete\n");
run_all (TRUE); run_all (TRUE);
ifnet_destroy (); ifnet_destroy ();
......
...@@ -4,8 +4,10 @@ INCLUDES = \ ...@@ -4,8 +4,10 @@ INCLUDES = \
-I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util
noinst_LTLIBRARIES = libifupdown-io.la noinst_LTLIBRARIES = libifupdown-io.la
......
...@@ -2,7 +2,9 @@ if ENABLE_TESTS ...@@ -2,7 +2,9 @@ if ENABLE_TESTS
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-I$(srcdir)/../ -I$(srcdir)/../
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment