diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-25 16:07:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-30 23:10:29 +0200 |
| commit | 7bf10a75db84655e65fe6216d248f7775c58ca23 (patch) | |
| tree | 8fbd9fe0f4a9e02c86662faeb364743c70964d08 /contrib | |
| parent | b861900d45da588f4239be418c3e1f62505cbde1 (diff) | |
| download | NetworkManager-7bf10a75db84655e65fe6216d248f7775c58ca23.tar.gz | |
build: extract version macros from "nm-version.h" to new header file "nm-version-macros.h"
For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus
paths of NetworkManager. It is desirable to have this header usable without
having a dependency on "glib.h", for example for a QT application. For that,
commit c0852964a890cf43cc2dcaeff41ac6edc5028f24 removed that dependancy.
For libnm-glib library, the analog to "nm-dbus-interface.h" is
"NetworkManager.h", and the same applies there. Commit
159e827a72f420048e12d318f8ba1edd3f641fc8 removed that include.
However, that broke build on PackageKit [1] which expected to get the
version macros by including "NetworkManager.h". So at least for libnm-glib,
we need to preserve old behavior so that a user including
"NetworkManager.h" gets the version macros, but not "glib.h".
Extract the version macros to a new header file "nm-version-macros.h".
This header doesn't include "glib.h" and can be included from
"NetworkManager.h". This gives as previous behavior and a glib-free
include.
For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h".
Very few users will actually need the version macros, but not using
libnm.
Users that use libnm, should just include (libnm's) "NetworkManager.h" to
get all headers.
As a special case, a user who doesn't want to use glib/libnm, but still
needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include
them both separately.
[1] https://github.com/hughsie/PackageKit/issues/85
Fixes: 4545a7fe9670ce4d7c259c11c2cc853bfae6729b
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 0fe856aa71..aa488cbd72 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -562,6 +562,7 @@ fi %dir %{_includedir}/%{name} %{_includedir}/%{name}/%{name}.h %{_includedir}/%{name}/NetworkManagerVPN.h +%{_includedir}/%{name}/nm-version-macros.h %{_includedir}/%{name}/nm-version.h %{_libdir}/pkgconfig/%{name}.pc %dir %{_datadir}/gtk-doc/html/NetworkManager |