mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 23:00:07 +01:00
7bf10a75db
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
54 lines
1.4 KiB
Makefile
54 lines
1.4 KiB
Makefile
AM_CPPFLAGS = \
|
|
-I${top_srcdir}/include \
|
|
-I$(top_builddir)/include \
|
|
-I${top_srcdir}/libnm-core \
|
|
-I${top_builddir}/libnm-core \
|
|
-I${top_srcdir}/libnm \
|
|
-I${top_builddir}/libnm \
|
|
$(GLIB_CFLAGS)
|
|
|
|
noinst_PROGRAMS = \
|
|
add-connection-gdbus \
|
|
add-connection-libnm \
|
|
get-active-connections-gdbus \
|
|
get-ap-info-libnm \
|
|
list-connections-gdbus \
|
|
list-connections-libnm \
|
|
monitor-nm-running-gdbus \
|
|
monitor-nm-state-gdbus
|
|
|
|
add_connection_gdbus_SOURCES = add-connection-gdbus.c
|
|
add_connection_gdbus_LDADD = \
|
|
$(GLIB_LIBS) \
|
|
$(UUID_LIBS)
|
|
|
|
add_connection_libnm_SOURCES = add-connection-libnm.c
|
|
add_connection_libnm_LDADD = \
|
|
$(top_builddir)/libnm/libnm.la \
|
|
$(GLIB_LIBS)
|
|
|
|
get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c
|
|
get_active_connections_gdbus_LDADD = \
|
|
$(GLIB_LIBS)
|
|
|
|
get_ap_info_libnm_SOURCES = get-ap-info-libnm.c
|
|
get_ap_info_libnm_LDADD = \
|
|
$(top_builddir)/libnm/libnm.la \
|
|
$(GLIB_LIBS)
|
|
|
|
list_connections_gdbus_SOURCES = list-connections-gdbus.c
|
|
list_connections_gdbus_LDADD = \
|
|
$(GLIB_LIBS)
|
|
|
|
list_connections_libnm_SOURCES = list-connections-libnm.c
|
|
list_connections_libnm_LDADD = \
|
|
$(top_builddir)/libnm/libnm.la \
|
|
$(GLIB_LIBS)
|
|
|
|
monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c
|
|
monitor_nm_running_gdbus_LDADD = \
|
|
$(GLIB_LIBS)
|
|
|
|
monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c
|
|
monitor_nm_state_gdbus_LDADD = \
|
|
$(GLIB_LIBS)
|