mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 20:40:06 +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
82 lines
1.9 KiB
Makefile
82 lines
1.9 KiB
Makefile
## Process this file with automake to produce Makefile.in
|
|
AUTOMAKE_OPTIONS = 1.6
|
|
|
|
# The name of the module
|
|
DOC_MODULE=libnm-glib
|
|
|
|
# The top-level SGML file.
|
|
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
|
|
|
|
# The directory containing the source code. Relative to $(srcdir).
|
|
# gtk-doc will search all .c & .h files beneath here for inline comments
|
|
# documenting functions and macros.
|
|
DOC_SOURCE_DIR=$(top_srcdir)/libnm-glib
|
|
|
|
# Extra options to supply to gtkdoc-scan.
|
|
SCAN_OPTIONS=
|
|
|
|
# Extra options to supply to gtkdoc-scangobj.
|
|
SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();'
|
|
|
|
# Extra options to supply to gtkdoc-mkdb.
|
|
MKDB_OPTIONS=--sgml-mode --output-format=xml
|
|
|
|
# Extra options to supply to gtkdoc-fixref.
|
|
FIXXREF_OPTIONS=
|
|
|
|
# Used for dependencies.
|
|
HFILE_GLOB=$(top_srcdir)/libnm-glib/*.h
|
|
CFILE_GLOB=$(top_srcdir)/libnm-glib/*.c
|
|
|
|
# Header files to ignore when scanning.
|
|
IGNORE_HFILES= \
|
|
common.h \
|
|
nm-dbus-helpers-private.h \
|
|
nm-device-private.h \
|
|
nm-object-cache.h \
|
|
nm-object-private.h \
|
|
nm-remote-connection-private.h \
|
|
nm-types-private.h \
|
|
nm-secret-agent-glue.h \
|
|
nm-vpn-plugin-glue.h
|
|
|
|
# Images to copy into HTML directory.
|
|
HTML_IMAGES = libnm-glib.png
|
|
|
|
# Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
|
|
content_files = version.xml
|
|
|
|
# Other files to distribute.
|
|
extra_files = libnm-glib.png
|
|
|
|
|
|
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
|
# if $(DOC_MODULE).types is non-empty.
|
|
GTKDOC_CFLAGS = \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_builddir)/include \
|
|
-I$(top_srcdir)/libnm-util \
|
|
-I$(top_builddir)/libnm-util \
|
|
-I$(top_srcdir)/libnm-glib \
|
|
-I$(top_builddir)/libnm-glib \
|
|
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
|
$(GLIB_CFLAGS) \
|
|
$(DBUS_CFLAGS)
|
|
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/libnm-glib/libnm-glib.la \
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
# include common portion ...
|
|
include $(top_srcdir)/gtk-doc.make
|
|
|
|
EXTRA_DIST += version.xml.in
|
|
|
|
CLEANFILES += \
|
|
libnm-glib-sections.txt \
|
|
libnm-glib-overrides.txt \
|
|
html/* \
|
|
tmpl/* \
|
|
xml/*
|
|
|