mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 06:28:05 +02: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
53 lines
1.2 KiB
Makefile
53 lines
1.2 KiB
Makefile
if ENABLE_TESTS
|
|
|
|
AM_CPPFLAGS = \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_builddir)/include \
|
|
-I$(top_srcdir)/libnm-util \
|
|
-I$(top_builddir)/libnm-util \
|
|
-I$(top_srcdir)/libnm-glib \
|
|
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
|
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
|
|
$(GLIB_CFLAGS) \
|
|
$(DBUS_CFLAGS)
|
|
|
|
noinst_PROGRAMS = $(TESTS)
|
|
|
|
if WITH_VALGRIND
|
|
@VALGRIND_RULES@ --launch-dbus
|
|
else
|
|
LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
|
|
endif
|
|
TESTS = test-nm-client test-remote-settings-client
|
|
|
|
####### NMClient and non-settings tests #######
|
|
|
|
test_nm_client_SOURCES = \
|
|
common.c \
|
|
common.h \
|
|
test-nm-client.c
|
|
|
|
test_nm_client_LDADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(top_builddir)/libnm-glib/libnm-glib.la \
|
|
$(GLIB_LIBS) \
|
|
$(DBUS_LIBS)
|
|
|
|
####### remote settings client test #######
|
|
|
|
test_remote_settings_client_SOURCES = \
|
|
common.c \
|
|
common.h \
|
|
test-remote-settings-client.c
|
|
|
|
test_remote_settings_client_LDADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(top_builddir)/libnm-glib/libnm-glib.la \
|
|
$(GLIB_LIBS) \
|
|
$(DBUS_LIBS)
|
|
|
|
###########################################
|
|
|
|
endif
|
|
|
|
EXTRA_DIST = libnm-glib-test-launch.sh
|