diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 008e28ab..a84c23da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3391,8 +3391,8 @@ am__recursive_targets = \ AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope check recheck distdir distdir-am dist dist-all \ distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -4864,6 +4864,7 @@ dbusactivationdir = $(datadir)/dbus-1/system-services servicedir = $(datadir)/dbus-1/system-services completiondir = $(datadir)/bash-completion/completions nmlocaledir = $(datadir)/locale +INTROSPECTION_EXTRA_CFLAGS = -Wno-incompatible-pointer-types-discards-qualifiers GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM SUBDIRS = . po $(am__append_1) @@ -5299,7 +5300,11 @@ shared_nm_glib_aux_tests_test_shared_general_LDADD = \ @WITH_JANSSON_TRUE@ $(GLIB_LIBS) \ @WITH_JANSSON_TRUE@ $(NULL) -introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) +introspection_libnmdbus_la_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(INTROSPECTION_EXTRA_CFLAGS) \ + $(NULL) + introspection_sources = \ introspection/org.freedesktop.NetworkManager.AccessPoint.c \ introspection/org.freedesktop.NetworkManager.AccessPoint.h \ @@ -5728,6 +5733,7 @@ libnm_core_libnm_core_la_LDFLAGS = \ @HAVE_CRYPTO_NSS_TRUE@ $(NSS_LIBS) nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h +nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "nm-default.h"\n' libnm_core_tests_cppflags = \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ @@ -6902,7 +6908,11 @@ src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h -@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(INTROSPECTION_EXTRA_CFLAGS) \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(NULL) + ############################################################################### @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ @@ -7469,6 +7479,7 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ + $(INTROSPECTION_EXTRA_CFLAGS) \ $(NULL) dispatcher_tests_test_dispatcher_envp_SOURCES = \ @@ -18317,6 +18328,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -18359,6 +18374,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -19933,7 +19950,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ clean-pppd_pluginLTLIBRARIES clean-sbinPROGRAMS cscope \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ + dist-zip dist-zstd distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -20081,8 +20098,6 @@ introspection/%.h: introspection/%.c docs/api/dbus-%.xml: introspection/%.c $() -$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources) -$(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_liblibnm_la_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) @@ -20498,7 +20513,7 @@ $(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenum ############################################################################### @WITH_PYTHON_BLACK_TRUE@check-python-black: -@WITH_PYTHON_BLACK_TRUE@ test "$$NMTST_SKIP_PYTHON_BLACK" != 1 && $(BLACK) --check $(top_srcdir) $(top_srcdir)/examples/python/gi/nm-wg-set +@WITH_PYTHON_BLACK_TRUE@ test "$$NMTST_SKIP_PYTHON_BLACK" == 1 || $(BLACK) --check $(top_srcdir) $(top_srcdir)/examples/python/gi/nm-wg-set ############################################################################### |