mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-06 15:30:14 +01:00
e0ca2bdb63
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, commitc0852964a8removed that dependancy. For libnm-glib library, the analog to "nm-dbus-interface.h" is "NetworkManager.h", and the same applies there. Commit159e827a72removed 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:4545a7fe96(cherry picked from commit7bf10a75db)
97 lines
3 KiB
Text
97 lines
3 KiB
Text
# In order for this to work correctly from both libnm-core/ and libnm/,
|
|
# we have to specify full pathnames. (We can't just use $(addprefix) from
|
|
# libnm/, because that's incompatible with the Makefile.introspection rules.)
|
|
|
|
core = $(top_srcdir)/libnm-core
|
|
core_build = $(top_builddir)/libnm-core
|
|
|
|
libnm_core_headers = \
|
|
$(top_builddir)/include/nm-version-macros.h \
|
|
$(core_build)/nm-core-enum-types.h \
|
|
$(core)/nm-connection.h \
|
|
$(core)/nm-core-types.h \
|
|
$(core)/nm-dbus-interface.h \
|
|
$(core)/nm-errors.h \
|
|
$(core)/nm-setting-8021x.h \
|
|
$(core)/nm-setting-adsl.h \
|
|
$(core)/nm-setting-bluetooth.h \
|
|
$(core)/nm-setting-bond.h \
|
|
$(core)/nm-setting-bridge-port.h \
|
|
$(core)/nm-setting-bridge.h \
|
|
$(core)/nm-setting-cdma.h \
|
|
$(core)/nm-setting-connection.h \
|
|
$(core)/nm-setting-dcb.h \
|
|
$(core)/nm-setting-generic.h \
|
|
$(core)/nm-setting-gsm.h \
|
|
$(core)/nm-setting-infiniband.h \
|
|
$(core)/nm-setting-ip-config.h \
|
|
$(core)/nm-setting-ip4-config.h \
|
|
$(core)/nm-setting-ip6-config.h \
|
|
$(core)/nm-setting-olpc-mesh.h \
|
|
$(core)/nm-setting-ppp.h \
|
|
$(core)/nm-setting-pppoe.h \
|
|
$(core)/nm-setting-serial.h \
|
|
$(core)/nm-setting-team-port.h \
|
|
$(core)/nm-setting-team.h \
|
|
$(core)/nm-setting-vlan.h \
|
|
$(core)/nm-setting-vpn.h \
|
|
$(core)/nm-setting-wimax.h \
|
|
$(core)/nm-setting-wired.h \
|
|
$(core)/nm-setting-wireless-security.h \
|
|
$(core)/nm-setting-wireless.h \
|
|
$(core)/nm-setting.h \
|
|
$(core)/nm-simple-connection.h \
|
|
$(core)/nm-utils.h \
|
|
$(core)/nm-version.h \
|
|
$(core)/nm-vpn-dbus-interface.h
|
|
|
|
libnm_core_private_headers = \
|
|
$(core)/crypto.h \
|
|
$(core)/nm-connection-private.h \
|
|
$(core)/nm-core-internal.h \
|
|
$(core)/nm-keyfile-internal.h \
|
|
$(core)/nm-keyfile-utils.h \
|
|
$(core)/nm-property-compare.h \
|
|
$(core)/nm-setting-private.h \
|
|
$(core)/nm-utils-private.h
|
|
|
|
libnm_core_sources = \
|
|
$(core_build)/nm-core-enum-types.c \
|
|
$(core)/crypto.c \
|
|
$(core)/nm-connection.c \
|
|
$(core)/nm-errors.c \
|
|
$(core)/nm-keyfile-reader.c \
|
|
$(core)/nm-keyfile-utils.c \
|
|
$(core)/nm-keyfile-writer.c \
|
|
$(core)/nm-property-compare.c \
|
|
$(core)/nm-setting-8021x.c \
|
|
$(core)/nm-setting-adsl.c \
|
|
$(core)/nm-setting-bluetooth.c \
|
|
$(core)/nm-setting-bond.c \
|
|
$(core)/nm-setting-bridge-port.c \
|
|
$(core)/nm-setting-bridge.c \
|
|
$(core)/nm-setting-cdma.c \
|
|
$(core)/nm-setting-connection.c \
|
|
$(core)/nm-setting-dcb.c \
|
|
$(core)/nm-setting-generic.c \
|
|
$(core)/nm-setting-gsm.c \
|
|
$(core)/nm-setting-infiniband.c \
|
|
$(core)/nm-setting-ip-config.c \
|
|
$(core)/nm-setting-ip4-config.c \
|
|
$(core)/nm-setting-ip6-config.c \
|
|
$(core)/nm-setting-olpc-mesh.c \
|
|
$(core)/nm-setting-ppp.c \
|
|
$(core)/nm-setting-pppoe.c \
|
|
$(core)/nm-setting-serial.c \
|
|
$(core)/nm-setting-team-port.c \
|
|
$(core)/nm-setting-team.c \
|
|
$(core)/nm-setting-vlan.c \
|
|
$(core)/nm-setting-vpn.c \
|
|
$(core)/nm-setting-wimax.c \
|
|
$(core)/nm-setting-wired.c \
|
|
$(core)/nm-setting-wireless-security.c \
|
|
$(core)/nm-setting-wireless.c \
|
|
$(core)/nm-setting.c \
|
|
$(core)/nm-simple-connection.c \
|
|
$(core)/nm-utils.c
|
|
|