summaryrefslogtreecommitdiff
path: root/src/devices/adsl
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-07-17 17:06:44 -0400
committerDan Winship <danw@gnome.org>2014-07-23 10:56:26 -0400
commitb28f6526c27b920827416315f13ca051bf5a644d (patch)
treedc8a924222fc59fe15091558f23d02c576dd3a0c /src/devices/adsl
parentb7c7832ae87054bdf4138d0c509a3a31504f69cf (diff)
downloadNetworkManager-b28f6526c27b920827416315f13ca051bf5a644d.tar.gz
core: fill in nm-types.h, clean out other headers
Clean up some of the cross-includes between headers (which made it so that, eg, if you included NetworkManagerUtils.h in a test program, you would need to build the test with -I$(top_srcdir)/src/platform, and if you included nm-device.h you'd need $(POLKIT_CFLAGS)) by moving all GObject struct definitions for src/ and src/settings/ into nm-types.h (which already existed to solve the NMDevice/NMActRequest circular references). Update various .c files to explicitly include the headers they used to get implicitly, and remove some now-unnecessary -I options from Makefiles.
Diffstat (limited to 'src/devices/adsl')
-rw-r--r--src/devices/adsl/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index 50024b3ee9..1770a7fd9d 100644
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -7,17 +7,13 @@ AM_CPPFLAGS = \
-I${top_builddir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/devices \
- -I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
- -I${top_srcdir}/src/ppp-manager \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \
- $(POLKIT_CFLAGS) \
- $(LIBNL_CFLAGS) \
$(GUDEV_CFLAGS)
GLIB_GENERATED = nm-adsl-enum-types.h nm-adsl-enum-types.c