diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-06 16:53:02 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:40 -0400 |
| commit | d0b05b34d5f1ad8f52a15fed48cc2c02d2251145 (patch) | |
| tree | 66943c391845d6c8fb2b4a26524c6d46c17a8e15 /callouts | |
| parent | 3ddce74803c15db7a970c737e8d4c33fccccb558 (diff) | |
libnm: add NetworkManager.h, disallow including individual headers
Add NetworkManager.h, which includes all of the other NM header, and
require all external users of libnm to use that rather than the
individual headers.
(An exception is made for nm-dbus-interface.h,
nm-vpn-dbus-interface.h, and nm-version.h, which can be included
separately.)
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 1 | ||||
| -rw-r--r-- | callouts/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | callouts/tests/test-dispatcher-envp.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index fc8e94fc4c..1e7001c34e 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index c0d61877dd..c06178b225 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/callouts \ + -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index a91ae2b27a..97b839b5f3 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -31,6 +31,7 @@ #include "nm-dbus-glib-types.h" #include "nm-dispatcher-api.h" #include "nm-utils.h" +#include "nm-utils-private.h" /*******************************************/ |