mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-27 03:18:17 +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
56 lines
1.2 KiB
Makefile
56 lines
1.2 KiB
Makefile
AM_CPPFLAGS= \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_builddir)/include \
|
|
-I$(top_srcdir)/libnm-core \
|
|
-I$(top_builddir)/libnm-core \
|
|
-DG_LOG_DOMAIN=\""nmtui"\" \
|
|
$(GLIB_CFLAGS) \
|
|
$(NEWT_CFLAGS) \
|
|
$(NULL)
|
|
|
|
noinst_LIBRARIES = libnmt-newt.a
|
|
|
|
libnmt_newt_a_SOURCES = \
|
|
nmt-newt.h \
|
|
nmt-newt-types.h \
|
|
nmt-newt-button.c \
|
|
nmt-newt-button.h \
|
|
nmt-newt-button-box.c \
|
|
nmt-newt-button-box.h \
|
|
nmt-newt-checkbox.c \
|
|
nmt-newt-checkbox.h \
|
|
nmt-newt-component.c \
|
|
nmt-newt-component.h \
|
|
nmt-newt-container.c \
|
|
nmt-newt-container.h \
|
|
nmt-newt-entry.c \
|
|
nmt-newt-entry.h \
|
|
nmt-newt-entry-numeric.c \
|
|
nmt-newt-entry-numeric.h \
|
|
nmt-newt-form.c \
|
|
nmt-newt-form.h \
|
|
nmt-newt-grid.c \
|
|
nmt-newt-grid.h \
|
|
nmt-newt-hacks.c \
|
|
nmt-newt-hacks.h \
|
|
nmt-newt-label.c \
|
|
nmt-newt-label.h \
|
|
nmt-newt-listbox.c \
|
|
nmt-newt-listbox.h \
|
|
nmt-newt-popup.c \
|
|
nmt-newt-popup.h \
|
|
nmt-newt-section.c \
|
|
nmt-newt-section.h \
|
|
nmt-newt-separator.c \
|
|
nmt-newt-separator.h \
|
|
nmt-newt-stack.c \
|
|
nmt-newt-stack.h \
|
|
nmt-newt-textbox.c \
|
|
nmt-newt-textbox.h \
|
|
nmt-newt-toggle-button.c \
|
|
nmt-newt-toggle-button.h \
|
|
nmt-newt-utils.c \
|
|
nmt-newt-utils.h \
|
|
nmt-newt-widget.c \
|
|
nmt-newt-widget.h \
|
|
$(NULL)
|