fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 10:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: remove libnm-glib references

Browse source 
Several plugins were using -I$(top_srcdir)/libnm-glib, which is bad
since libnm-glib has its own nm-types.h which is different from src's.
Worse yet, some were actually linking against libnm-glib (which
presumably only worked at all because they weren't calling any
functions in it and so the linker just ignored the request). Fix both
problems.
This commit is contained in:
Dan Winship 2014-07-17 17:05:02 -04:00
parent 371c68cee9
commit b7c7832ae8
8 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/ifcfg-rh/Makefile.am
View file

@ -32,7 +32,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/posix-signals \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
@ -53,7 +52,6 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
libifcfg-rh-io.la \
$(GLIB_LIBS)

4
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file

@ -11,7 +11,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/platform \
@ -31,8 +30,7 @@ AM_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS)
AM_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la
$(top_builddir)/libnm-util/libnm-util.la
noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils

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

@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/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 \
-DSYSCONFDIR=\"$(sysconfdir)\"
@ -21,6 +20,5 @@ libnm_settings_plugin_ifcfg_suse_la_SOURCES = \
libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifcfg_suse_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS)

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

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
@ -35,7 +34,6 @@ libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifnet_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
lib-ifnet-io.la\
$(GLIB_LIBS) \
$(GUDEV_LIBS)

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

@ -4,7 +4,6 @@ if ENABLE_TESTS
AM_CPPFLAGS= \
-I$(srcdir)/../ \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/include \

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

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/config \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \

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

@ -4,7 +4,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \
@ -25,7 +24,6 @@ test_ifupdown_SOURCES = \
test_ifupdown_LDADD = \
$(top_builddir)/src/libNetworkManager.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS)

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

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \
@ -34,7 +33,6 @@ test_keyfile_SOURCES = \
test_keyfile_LDADD = \
$(top_builddir)/src/libNetworkManager.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS) \
$(CODE_COVERAGE_LDFLAGS)