about summary refs log tree commit diff
path: root/docs/libnm-util/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'docs/libnm-util/Makefile.in')
-rw-r--r--docs/libnm-util/Makefile.in21
1 files changed, 9 insertions, 12 deletions
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 6471f826..63858099 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -209,7 +209,7 @@ GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -263,14 +263,13 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
 LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
+LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
@@ -341,8 +340,11 @@ QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READELF = @READELF@
 READLINE_LIBS = @READLINE_LIBS@
-SANITIZERS = @SANITIZERS@
 SANITIZER_ENV = @SANITIZER_ENV@
+SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@
+SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@
+SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@
+SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -465,9 +467,6 @@ DOC_SOURCE_DIR = \
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --rebuild-types --rebuild-sections
 
-# 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
 
@@ -481,7 +480,6 @@ CFILE_GLOB = $(top_srcdir)/libnm-util/*.c
 # Header files to ignore when scanning.
 IGNORE_HFILES = \
 	crypto.h \
-	nm-setting-template.h \
 	nm-utils-private.h \
 	nm-setting-private.h \
 	nm-param-spec-specialized.h \
@@ -501,10 +499,9 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir)/libnm-util	\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+	-I$(top_srcdir)/libnm-util \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
-	$(GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 GTKDOC_LIBS = \
@@ -534,7 +531,7 @@ SETUP_FILES = \
 
 
 # include common portion ...
-EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	sgml.stamp html.stamp pdf.stamp