fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 18:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: srcdir != builddir issues in plugins

Browse source
This commit is contained in:
Pavel Šimerda 2012-11-14 19:39:23 +01:00
parent 2a900e2d0d
commit aa0c7d863d
6 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/settings/plugins/ifcfg-suse/Makefile.am
View file

@ -10,6 +10,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
-I${top_srcdir}/src/settings \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-DSYSCONFDIR=\"$(sysconfdir)\"

4
src/settings/plugins/ifnet/Makefile.am
View file

@ -4,8 +4,10 @@ INCLUDES = \
-I$(top_srcdir)/src/wifi \
-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_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util
pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la

11
src/settings/plugins/ifnet/tests/Makefile.am
View file

@ -3,12 +3,19 @@ if ENABLE_TESTS
INCLUDES=-I$(srcdir)/../ \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/src/settings
TESTS = check_ifnet
check_PROGRAMS = check_ifnet
check_ifnet_SOURCES = test_all.c
check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
check_ifnet_SOURCES = test_all.c
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 \
$(builddir)/../lib-ifnet-io.la \
$(CHECK_LIBS) \

2
src/settings/plugins/ifnet/tests/test_all.c
View file

@ -436,7 +436,7 @@ main (void)
ifnet_destroy ();
wpa_parser_destroy ();
ifnet_init ("net");
wpa_parser_init ("wpa_supplicant.conf");
wpa_parser_init (TEST_WPA_SUPPLICANT_CONF);
printf ("Initialization complete\n");
run_all (TRUE);
ifnet_destroy ();

4
src/settings/plugins/ifupdown/Makefile.am
View file

@ -4,8 +4,10 @@ INCLUDES = \
-I$(top_srcdir)/src/logging \
-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_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util
noinst_LTLIBRARIES = libifupdown-io.la

2
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -2,7 +2,9 @@ if ENABLE_TESTS
INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(srcdir)/../