mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-26 18:10:08 +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)
73 lines
1.6 KiB
Makefile
73 lines
1.6 KiB
Makefile
bin_PROGRAMS = \
|
|
nmcli
|
|
|
|
AM_CPPFLAGS = \
|
|
-I${top_srcdir} \
|
|
-I${top_builddir} \
|
|
-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 \
|
|
-I${top_srcdir}/clients/common \
|
|
$(GLIB_CFLAGS) \
|
|
-DG_LOG_DOMAIN=\""nmcli"\" \
|
|
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
|
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
|
|
|
|
nmcli_SOURCES = \
|
|
agent.c \
|
|
agent.h \
|
|
common.c \
|
|
common.h \
|
|
connections.c \
|
|
connections.h \
|
|
devices.c \
|
|
devices.h \
|
|
general.c \
|
|
general.h \
|
|
settings.c \
|
|
settings.h \
|
|
nmcli.c \
|
|
nmcli.h \
|
|
utils.c \
|
|
utils.h \
|
|
polkit-agent.c \
|
|
polkit-agent.h \
|
|
\
|
|
$(srcdir)/../common/nm-secret-agent-simple.c \
|
|
$(srcdir)/../common/nm-secret-agent-simple.h \
|
|
$(NULL)
|
|
|
|
nmcli_LDADD = \
|
|
$(GLIB_LIBS) \
|
|
$(READLINE_LIBS) \
|
|
$(top_builddir)/libnm/libnm.la
|
|
|
|
if WITH_POLKIT_AGENT
|
|
AM_CPPFLAGS += $(POLKIT_CFLAGS)
|
|
nmcli_SOURCES += $(srcdir)/../common/nm-polkit-listener.c $(srcdir)/../common/nm-polkit-listener.h
|
|
nmcli_LDADD += $(POLKIT_LIBS)
|
|
endif
|
|
|
|
if BUILD_SETTING_DOCS
|
|
settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-property-docs.xml
|
|
$(AM_V_GEN) xsltproc --output $@ $^
|
|
|
|
BUILT_SOURCES = settings-docs.c
|
|
CLEANFILES = settings-docs.c
|
|
endif
|
|
|
|
EXTRA_DIST = settings-docs.c settings-docs.xsl
|
|
|
|
completiondir = $(datadir)/bash-completion/completions
|
|
|
|
install-data-hook:
|
|
$(mkinstalldirs) $(DESTDIR)$(completiondir)
|
|
$(INSTALL_DATA) $(srcdir)/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
|
|
|
|
uninstall-hook:
|
|
rm -f $(DESTDIR)$(completiondir)/nmcli
|
|
|
|
EXTRA_DIST += nmcli-completion
|