mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-31 17:10:12 +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)
49 lines
1.2 KiB
Makefile
49 lines
1.2 KiB
Makefile
include $(GLIB_MAKEFILE)
|
|
|
|
SUBDIRS = . tests
|
|
|
|
AM_CPPFLAGS = \
|
|
-I${top_srcdir}/include \
|
|
-I${top_builddir}/include \
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
-DLOCALEDIR=\"$(datadir)/locale\" \
|
|
-DNETWORKMANAGER_COMPILATION \
|
|
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
|
$(GLIB_CFLAGS)
|
|
|
|
noinst_LTLIBRARIES = libnm-core.la
|
|
|
|
# header/source defines are in Makefile.libnm-core, so they can be shared
|
|
# with libnm/Makefile.am
|
|
include Makefile.libnm-core
|
|
|
|
libnmincludedir = $(includedir)/libnm
|
|
|
|
libnminclude_HEADERS = $(libnm_core_headers)
|
|
libnm_core_la_SOURCES = \
|
|
$(libnm_core_sources) \
|
|
$(libnm_core_private_headers)
|
|
|
|
GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c
|
|
nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnminclude_HEADERS))
|
|
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
|
|
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
|
|
|
|
libnm_core_la_LIBADD = \
|
|
$(GLIB_LIBS) \
|
|
$(UUID_LIBS)
|
|
|
|
if WITH_GNUTLS
|
|
AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS)
|
|
libnm_core_la_SOURCES += crypto_gnutls.c
|
|
libnm_core_la_LIBADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS)
|
|
endif
|
|
|
|
if WITH_NSS
|
|
AM_CPPFLAGS += $(NSS_CFLAGS)
|
|
libnm_core_la_SOURCES += crypto_nss.c
|
|
libnm_core_la_LIBADD += $(NSS_LIBS)
|
|
endif
|
|
|
|
BUILT_SOURCES = $(GLIB_GENERATED)
|
|
CLEANFILES = $(BUILT_SOURCES)
|