diff options
48 files changed, 11 insertions, 104 deletions
diff --git a/Makefile.am b/Makefile.am index b1c28551a4..1dabbb0819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4362,8 +4362,10 @@ test_compress_LDADD = \ libsystemd-shared.la if HAVE_LZ4 +test_compress_CFLAGS += \ + $(LZ4_CFLAGA) test_compress_LDADD += \ - -llz4 + $(LZ4_LIBS) endif test_compress_benchmark_SOURCES = \ diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk index b91e83f486..5b38450813 100644 --- a/build-aux/Makefile.each.tail/50-sd.mk +++ b/build-aux/Makefile.each.tail/50-sd.mk @@ -24,11 +24,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk %-from-name.gperf: %-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ %-from-name.h: %-from-name.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ $(outdir)/%: sysctl.d/%.in @@ -39,11 +37,9 @@ $(outdir)/%: sysctl.d/%.in $(AM_V_GEN)chmod +x $@ $(outdir)/%.c: src/%.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) < $< > $@ $(outdir)/%: src/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ $(outdir)/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent @@ -66,7 +62,6 @@ $(outdir)/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent # Stupid test that everything purported to be exported really is define generate-sym-test - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_at)printf '#include <stdio.h>\n' > $@ $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@ $(AM_V_at)printf 'void* functions[] = {\n' >> $@ diff --git a/build-aux/Makefile.each.tail/70-man.mk b/build-aux/Makefile.each.tail/70-man.mk index 7de64224fb..97a50bd352 100644 --- a/build-aux/Makefile.each.tail/70-man.mk +++ b/build-aux/Makefile.each.tail/70-man.mk @@ -57,7 +57,6 @@ CLEANFILES += \ docs/html/man $(outdir)/man: - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_LN)$(LN_S) -f ../../man $@ $(outdir)/index.html: man/systemd.index.html @@ -84,11 +83,9 @@ update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-en @echo "Makefile-man.am has been regenerated" $(outdir)/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES) - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^) $(outdir)/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES) - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES) CLEANFILES += \ diff --git a/discard.mk b/discard.mk index e3113d863d..26ff4a3dae 100644 --- a/discard.mk +++ b/discard.mk @@ -100,7 +100,6 @@ CLEANFILES = $(BUILT_SOURCES) \ $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \ $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS) -AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ @@ -172,8 +171,6 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd-network \ $(OUR_CPPFLAGS) -AM_CFLAGS = $(OUR_CFLAGS) -AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ define move-to-rootlibdir @@ -670,7 +667,6 @@ endif # ENABLE_TESTS # packed sysfs test tree $(outdir)/sys: test/sys.tar.xz -rm -rf test/sys - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz -touch test/sys @@ -778,20 +774,16 @@ $(outdir)/%: shell-completion/%.in $(SED_PROCESS) $(outdir)/%: sysusers.d/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ $(outdir)/%: tmpfiles.d/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ $(outdir)/%: units/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ $(outdir)/%: units/user/%.m4 $(top_builddir)/config.status - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ ifneq ($(ENABLE_POLKIT),) diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index 5533e677a1..90bbed9fad 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -29,12 +29,10 @@ bootctl_SOURCES = \ src/boot/bootctl.c bootctl_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \ -DBOOTLIBDIR=\"$(bootlibdir)\" bootctl_CFLAGS = \ - $(AM_CFLAGS) \ $(BLKID_CFLAGS) bootctl_LDADD = \ diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index 9597f7c137..08fc6d44df 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -30,7 +30,6 @@ systemd_coredump_SOURCES = \ src/coredump/coredump-vacuum.h systemd_coredump_CFLAGS = \ - $(AM_CFLAGS) \ $(ACL_CFLAGS) systemd_coredump_LDADD = \ diff --git a/src/grp-initprogs/systemd-modules-load/Makefile b/src/grp-initprogs/systemd-modules-load/Makefile index 9ed48c3ce4..01ee557164 100644 --- a/src/grp-initprogs/systemd-modules-load/Makefile +++ b/src/grp-initprogs/systemd-modules-load/Makefile @@ -28,7 +28,6 @@ systemd_modules_load_SOURCES = \ src/modules-load/modules-load.c systemd_modules_load_CFLAGS = \ - $(AM_CFLAGS) \ $(KMOD_CFLAGS) systemd_modules_load_LDADD = \ diff --git a/src/grp-initprogs/systemd-tmpfiles/Makefile b/src/grp-initprogs/systemd-tmpfiles/Makefile index d0ba788fce..14da180947 100644 --- a/src/grp-initprogs/systemd-tmpfiles/Makefile +++ b/src/grp-initprogs/systemd-tmpfiles/Makefile @@ -28,7 +28,6 @@ systemd_tmpfiles_SOURCES = \ src/tmpfiles/tmpfiles.c systemd_tmpfiles_CFLAGS = \ - $(AM_CFLAGS) \ $(ACL_CFLAGS) systemd_tmpfiles_LDADD = \ diff --git a/src/grp-initprogs/systemd-update-utmp/Makefile b/src/grp-initprogs/systemd-update-utmp/Makefile index 516af17a22..506e4840a5 100644 --- a/src/grp-initprogs/systemd-update-utmp/Makefile +++ b/src/grp-initprogs/systemd-update-utmp/Makefile @@ -32,7 +32,6 @@ systemd_update_utmp_SOURCES = \ src/update-utmp/update-utmp.c systemd_update_utmp_CFLAGS = \ - $(AM_CFLAGS) \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 260d86dece..01802eff17 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -93,7 +93,6 @@ test_catalog_SOURCES = \ src/journal/test-catalog.c test_catalog_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -DCATALOG_DIR=\"$(abs_top_builddir)/catalog\" test_catalog_LDADD = \ @@ -106,8 +105,10 @@ test_compress_LDADD = \ libsystemd-shared.la ifneq ($(HAVE_LZ4),) +test_compress_CFLAGS += \ + $(LZ4_CFLAGA) test_compress_LDADD += \ - -llz4 + $(LZ4_LIBS) endif test_compress_benchmark_SOURCES = \ diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile index 683a1b62dc..0ae96978af 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile @@ -44,11 +44,9 @@ systemd_journal_gatewayd_LDADD += \ endif # HAVE_GNUTLS systemd_journal_gatewayd_CFLAGS = \ - $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) systemd_journal_gatewayd_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" dist_systemunit_DATA += \ diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile index b387eae386..8bb2c3871d 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile @@ -43,7 +43,6 @@ systemd_journal_remote_SOURCES += \ src/journal-remote/microhttpd-util.c systemd_journal_remote_CFLAGS = \ - $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) systemd_journal_remote_LDADD += \ diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile index a0abb4a74a..f6966df0f6 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile @@ -33,7 +33,6 @@ systemd_journal_upload_SOURCES = \ src/journal-remote/journal-upload-journal.c systemd_journal_upload_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile index 185b942f27..fe262b7517 100644 --- a/src/grp-journal/journalctl/Makefile +++ b/src/grp-journal/journalctl/Makefile @@ -23,9 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -# using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ - $(AM_CFLAGS) journalctl_SOURCES = \ src/journal/journalctl.c diff --git a/src/grp-locale/systemd-localed/Makefile b/src/grp-locale/systemd-localed/Makefile index 38bbc6db9e..1a12959a61 100644 --- a/src/grp-locale/systemd-localed/Makefile +++ b/src/grp-locale/systemd-localed/Makefile @@ -34,7 +34,6 @@ systemd_localed_LDADD = \ -ldl systemd_localed_CFLAGS = \ - $(AM_CFLAGS) \ $(XKBCOMMON_CFLAGS) nodist_systemunit_DATA += \ diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile index 9bb3af70b0..8de05d9b7b 100644 --- a/src/grp-login/pam_systemd/Makefile +++ b/src/grp-login/pam_systemd/Makefile @@ -29,11 +29,9 @@ pam_systemd_la_SOURCES = \ src/login/pam_systemd.c pam_systemd_la_CFLAGS = \ - $(AM_CFLAGS) \ $(PAM_CFLAGS) pam_systemd_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile index a07572e06e..585001b2fa 100644 --- a/src/grp-machine/grp-import/libimport/Makefile +++ b/src/grp-machine/grp-import/libimport/Makefile @@ -32,7 +32,6 @@ test_qcow2_SOURCES = \ src/import/qcow2-util.h test_qcow2_CFLAGS = \ - $(AM_CFLAGS) \ $(ZLIB_CFLAGS) test_qcow2_LDADD = \ diff --git a/src/grp-machine/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile index dfed613e6f..fa6306226f 100644 --- a/src/grp-machine/grp-import/systemd-export/Makefile +++ b/src/grp-machine/grp-import/systemd-export/Makefile @@ -37,7 +37,6 @@ systemd_export_SOURCES = \ src/import/import-compress.h systemd_export_CFLAGS = \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ $(BZIP2_CFLAGS) diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile index 7eba7cb044..8d04ec18c5 100644 --- a/src/grp-machine/grp-import/systemd-import/Makefile +++ b/src/grp-machine/grp-import/systemd-import/Makefile @@ -38,7 +38,6 @@ systemd_import_SOURCES = \ src/import/qcow2-util.h systemd_import_CFLAGS = \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ $(BZIP2_CFLAGS) diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile index e00f531a0d..19705a925e 100644 --- a/src/grp-machine/grp-import/systemd-importd/Makefile +++ b/src/grp-machine/grp-import/systemd-importd/Makefile @@ -28,7 +28,6 @@ systemd_importd_SOURCES = \ src/import/importd.c systemd_importd_CFLAGS = \ - $(AM_CFLAGS) \ -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile index d7ece7396e..a9653a5f2c 100644 --- a/src/grp-machine/grp-import/systemd-pull/Makefile +++ b/src/grp-machine/grp-import/systemd-pull/Makefile @@ -44,7 +44,6 @@ systemd_pull_SOURCES = \ src/import/qcow2-util.h systemd_pull_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(XZ_CFLAGS) \ $(ZLIB_CFLAGS) \ diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index bc7f9e791a..54d78ed2f1 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -28,7 +28,6 @@ libnss_mymachines_la_SOURCES = \ src/nss-mymachines/nss-mymachines.c libnss_mymachines_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile index 48301a8905..321c05d7ea 100644 --- a/src/grp-network/libnetworkd-core/Makefile +++ b/src/grp-network/libnetworkd-core/Makefile @@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \ libnetworkd-core.la libnetworkd_core_la_CFLAGS = \ - $(AM_CFLAGS) libnetworkd_core_la_SOURCES = \ src/libsystemd-network/network-internal.h \ diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile index 83036c8a5f..421bb9a673 100644 --- a/src/grp-network/systemd-networkd-wait-online/Makefile +++ b/src/grp-network/systemd-networkd-wait-online/Makefile @@ -27,7 +27,6 @@ rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_CFLAGS = \ - $(AM_CFLAGS) systemd_networkd_wait_online_SOURCES = \ src/libsystemd-network/network-internal.h \ diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile index fe2c4efc95..40ee1e85b5 100644 --- a/src/grp-resolve/libbasic-dns/Makefile +++ b/src/grp-resolve/libbasic-dns/Makefile @@ -24,15 +24,12 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk $(outdir)/dns_type-list.txt: src/resolve/dns-type.h - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ $(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ $(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ tests += \ @@ -51,7 +48,6 @@ test_resolve_tables_SOURCES = \ src/shared/test-tables.h test_resolve_tables_CFLAGS = \ - $(AM_CFLAGS) \ $(GCRYPT_CFLAGS) test_resolve_tables_LDADD = \ @@ -64,11 +60,9 @@ test_dns_packet_SOURCES = \ $(basic_dns_sources) test_dns_packet_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" test_dns_packet_CFLAGS = \ - $(AM_CFLAGS) \ $(GCRYPT_CFLAGS) test_dns_packet_LDADD = \ @@ -94,7 +88,6 @@ test_dnssec_SOURCES = \ $(basic_dns_sources) test_dnssec_CFLAGS = \ - $(AM_CFLAGS) \ $(GCRYPT_CFLAGS) test_dnssec_LDADD = \ diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile index 8ed87994ce..badbacdb3a 100644 --- a/src/grp-resolve/nss-resolve/Makefile +++ b/src/grp-resolve/nss-resolve/Makefile @@ -28,7 +28,6 @@ libnss_resolve_la_SOURCES = \ src/nss-resolve/nss-resolve.c libnss_resolve_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile index 3ca4419c36..9d9b46d58d 100644 --- a/src/grp-resolve/systemd-resolve/Makefile +++ b/src/grp-resolve/systemd-resolve/Makefile @@ -34,7 +34,6 @@ nodist_systemd_resolve_SOURCES = \ src/resolve/dns_type-to-name.h systemd_resolve_CFLAGS = \ - $(AM_CFLAGS) \ $(GCRYPT_CFLAGS) systemd_resolve_LDADD = \ diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index b84eba9829..78b352b76f 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -92,7 +92,6 @@ nodist_systemd_resolved_SOURCES = \ src/resolve/resolved-gperf.c systemd_resolved_CFLAGS = \ - $(AM_CFLAGS) \ $(GCRYPT_CFLAGS) systemd_resolved_LDADD = \ diff --git a/src/grp-system/grp-utils/systemd-analyze/Makefile b/src/grp-system/grp-utils/systemd-analyze/Makefile index 9d647e5a52..cb1b72e77d 100644 --- a/src/grp-system/grp-utils/systemd-analyze/Makefile +++ b/src/grp-system/grp-utils/systemd-analyze/Makefile @@ -30,7 +30,6 @@ systemd_analyze_SOURCES = \ src/analyze/analyze-verify.h systemd_analyze_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile index 8e546f0b0c..02b3add171 100644 --- a/src/grp-system/libcore/Makefile +++ b/src/grp-system/libcore/Makefile @@ -147,7 +147,6 @@ nodist_libcore_la_SOURCES = \ src/core/load-fragment-gperf-nulstr.c libcore_la_CFLAGS = \ - $(AM_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ $(KMOD_CFLAGS) \ @@ -164,7 +163,6 @@ libcore_la_LIBADD = \ $(MOUNT_LIBS) $(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index e1de1cd415..7f7fbb963e 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/Makefile @@ -28,7 +28,6 @@ systemd_SOURCES = \ src/core/main.c systemd_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 8e9848309b..d986e79b08 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \ libudev-core.la $(outdir)/keyboard-keys-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ @@ -67,7 +66,6 @@ gperf_gperf_sources += \ src/udev/net/link-config-gperf.gperf libudev_core_la_CFLAGS = \ - $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ $(KMOD_CFLAGS) diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile index d442808156..beb8ba449d 100644 --- a/src/libbasic/include/basic/Makefile +++ b/src/libbasic/include/basic/Makefile @@ -24,19 +24,16 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk $(outdir)/errno-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ $(outdir)/af-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@ $(outdir)/af-to-name.h: $(outdir)/af-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ $(outdir)/arphrd-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@ $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ @@ -45,7 +42,6 @@ $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@ $(outdir)/cap-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ $(outdir)/cap-to-name.h: $(outdir)/cap-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@ diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile index 9067d9bd0b..f91014e14e 100644 --- a/src/libbasic/src/Makefile +++ b/src/libbasic/src/Makefile @@ -228,7 +228,6 @@ nodist_libbasic_la_SOURCES = \ src/basic/cap-to-name.h libbasic_la_CFLAGS = \ - $(AM_CFLAGS) \ $(SELINUX_CFLAGS) \ $(CAP_CFLAGS) \ -pthread diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index ced0f7e476..6016feec17 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -32,7 +32,6 @@ libfirewall_la_SOURCES = \ src/shared/firewall-util.c libfirewall_la_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBIPTC_CFLAGS) libfirewall_la_LIBADD = \ diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile index e07bdbdcc1..053e56feaa 100644 --- a/src/libshared/src/Makefile +++ b/src/libshared/src/Makefile @@ -131,7 +131,6 @@ libshared_la_SOURCES += \ endif # HAVE_ACL libshared_la_CFLAGS = \ - $(AM_CFLAGS) \ $(ACL_CFLAGS) \ $(LIBIDN_CFLAGS) \ $(SECCOMP_CFLAGS) @@ -156,7 +155,6 @@ libsystemd_shared_la_SOURCES = \ $(libudev_internal_la_SOURCES) libsystemd_shared_la_CFLAGS = \ - $(AM_CFLAGS) \ $(libbasic_la_CFLAGS) \ $(libshared_la_CFLAGS) \ $(libsystemd_internal_la_CFLAGS) \ @@ -179,7 +177,6 @@ libsystemd_shared_la_LIBADD = \ $(SECCOMP_LIBS) libsystemd_shared_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -release $(PACKAGE_VERSION) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile index 2c1691b36b..c636e3cab1 100644 --- a/src/libsystemd-network/src/Makefile +++ b/src/libsystemd-network/src/Makefile @@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \ libsystemd-network.la libsystemd_network_la_CFLAGS = \ - $(AM_CFLAGS) \ $(KMOD_CFLAGS) libsystemd_network_la_SOURCES = \ diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 5a64800194..a6c9314ca0 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -35,7 +35,6 @@ EXTRA_DIST += \ libsystemd_la_SOURCES = libsystemd_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ -Wl,--version-script=$(srcdir)/libsystemd.sym diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 9f380d71f1..7178aab909 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -157,9 +157,7 @@ nodist_libsystemd_journal_internal_la_SOURCES = \ gperf_txt_sources += \ src/journal/audit_type-list.txt -# using _CFLAGS = in the conditional below would suppress AM_CFLAGS libsystemd_journal_internal_la_CFLAGS = \ - $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile index d0415fb0d3..f21c66ad74 100644 --- a/src/libsystemd/src/sd-journal/Makefile +++ b/src/libsystemd/src/sd-journal/Makefile @@ -29,7 +29,6 @@ audit_list_includes += -include libaudit.h endif # HAVE_AUDIT $(outdir)/audit_type-list.txt: - $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@ $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ diff --git a/src/libsystemd/src/test.mk b/src/libsystemd/src/test.mk index de78dfd000..689705fb40 100644 --- a/src/libsystemd/src/test.mk +++ b/src/libsystemd/src/test.mk @@ -32,7 +32,6 @@ test_bus_marshal_LDADD = \ $(DBUS_LIBS) test_bus_marshal_CFLAGS = \ - $(AM_CFLAGS) \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -52,7 +51,6 @@ test_bus_cleanup_SOURCES = \ src/libsystemd/sd-bus/test-bus-cleanup.c test_bus_cleanup_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) test_bus_cleanup_LDADD = \ @@ -85,7 +83,6 @@ test_bus_gvariant_LDADD = \ $(GLIB_LIBS) test_bus_gvariant_CFLAGS = \ - $(AM_CFLAGS) \ $(GLIB_CFLAGS) test_bus_creds_SOURCES = \ diff --git a/src/libudev/Makefile b/src/libudev/Makefile index bb72200e04..89189839b1 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -34,7 +34,6 @@ rootlib_LTLIBRARIES += \ libudev.la libudev_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ -Wl,--version-script=$(srcdir)/libudev.sym @@ -56,7 +55,6 @@ test-libudev-sym.c: \ nodist_test_libudev_sym_SOURCES = \ test-libudev-sym.c test_libudev_sym_CFLAGS = \ - $(AM_CFLAGS) \ -Wno-deprecated-declarations test_libudev_sym_LDADD = \ libudev.la diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile index c98ab37e08..4aa0c45cdd 100644 --- a/src/nss-myhostname/Makefile +++ b/src/nss-myhostname/Makefile @@ -29,7 +29,6 @@ libnss_myhostname_la_SOURCES = \ src/nss-myhostname/nss-myhostname.c libnss_myhostname_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index a39c01e41e..f4c8afad96 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -38,7 +38,6 @@ systemd_cryptsetup_SOURCES = \ src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile index 1d481ad9f4..ce6b56f998 100644 --- a/src/systemd-gpt-auto-generator/Makefile +++ b/src/systemd-gpt-auto-generator/Makefile @@ -36,7 +36,6 @@ systemd_gpt_auto_generator_LDADD = \ $(BLKID_LIBS) systemd_gpt_auto_generator_CFLAGS = \ - $(AM_CFLAGS) \ $(BLKID_CFLAGS) endif # HAVE_BLKID diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 080a543b8f..a173fd204a 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -58,7 +58,6 @@ gperf_gperf_sources += \ src/nspawn/nspawn-gperf.gperf systemd_nspawn_CFLAGS = \ - $(AM_CFLAGS) \ $(ACL_CFLAGS) \ $(BLKID_CFLAGS) \ $(SECCOMP_CFLAGS) \ @@ -82,7 +81,6 @@ test_patch_uid_SOURCES = \ src/nspawn/test-patch-uid.c test_patch_uid_CFLAGS = \ - $(AM_CFLAGS) \ $(ACL_CFLAGS) test_patch_uid_LDADD = \ diff --git a/test/Makefile b/test/Makefile index d2b873ac33..cd08325711 100644 --- a/test/Makefile +++ b/test/Makefile @@ -259,7 +259,6 @@ test_engine_SOURCES = \ src/test/test-engine.c test_engine_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) @@ -270,7 +269,6 @@ test_job_type_SOURCES = \ src/test/test-job-type.c test_job_type_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) @@ -281,7 +279,6 @@ test_ns_SOURCES = \ src/test/test-ns.c test_ns_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) test_ns_LDADD = \ @@ -321,7 +318,6 @@ test_unit_name_SOURCES = \ src/test/test-unit-name.c test_unit_name_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) @@ -332,7 +328,6 @@ test_unit_file_SOURCES = \ src/test/test-unit-file.c test_unit_file_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) @@ -349,7 +344,6 @@ test_capability_SOURCES = \ src/test/test-capability.c test_capability_CFLAGS = \ - $(AM_CFLAGS) \ $(CAP_CFLAGS) test_capability_LDADD = \ @@ -541,7 +535,6 @@ test_cap_list_SOURCES = \ src/test/test-cap-list.c test_cap_list_CFLAGS = \ - $(AM_CFLAGS) \ $(CAP_CFLAGS) test_cap_list_LDADD = \ @@ -624,7 +617,6 @@ BUILT_SOURCES += \ src/test/test-hashmap-ordered.c $(outdir)/test-hashmap-ordered.c: src/test/test-hashmap-plain.c - $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \ { if (!match($$0, "^#include")) \ gsub(/hashmap/, "ordered_hashmap"); \ @@ -679,10 +671,8 @@ test_tables_SOURCES = \ src/journal/journald-server.h test_tables_CPPFLAGS = \ - $(AM_CPPFLAGS) test_tables_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) \ $(MOUNT_CFLAGS) @@ -744,7 +734,6 @@ test_firewall_util_SOURCES = \ src/test/test-firewall-util.c test_firewall_util_CFLAGS = \ - $(AM_CFLAGS) \ $(LIBIPTC_CFLAGS) test_firewall_util_LDADD = \ @@ -757,7 +746,6 @@ test_netlink_manual_SOURCES = \ src/test/test-netlink-manual.c test_netlink_manual_CFLAGS = \ - $(AM_CFLAGS) \ $(KMOD_CFLAGS) test_netlink_manual_LDADD = \ @@ -816,11 +804,9 @@ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c test_cgroup_mask_CPPFLAGS = \ - $(AM_CPPFLAGS) \ $(MOUNT_CFLAGS) test_cgroup_mask_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) test_cgroup_mask_LDADD = \ @@ -860,7 +846,6 @@ test_path_SOURCES = \ src/test/test-path.c test_path_CFLAGS = \ - $(AM_CFLAGS) \ $(MOUNT_CFLAGS) test_path_LDADD = \ @@ -870,7 +855,6 @@ test_execute_SOURCES = \ src/test/test-execute.c test_execute_CFLAGS = \ - $(AM_CFLAGS) \ $(MOUNT_CFLAGS) test_execute_LDADD = \ @@ -904,11 +888,9 @@ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c test_sched_prio_CPPFLAGS = \ - $(AM_CPPFLAGS) \ $(MOUNT_CFLAGS) test_sched_prio_CFLAGS = \ - $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) test_sched_prio_LDADD = \ diff --git a/tools/notsd-move b/tools/notsd-move index 0e8cc0dd87..5a907109bd 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -697,10 +697,6 @@ breakup_makefile() ( rm .tmp.move.all sed -ri \ - -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ - -e 's/ \$\(CFLAGS\) / /g' \ - -e 's/ \$\(CPPFLAGS\) / /g' \ - -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ src/libbasic/include/basic/Makefile \ src/libsystemd/src/Makefile \ @@ -745,8 +741,13 @@ breakup_makefile() ( fixup_makefile() { sed -r \ + -e '#### Specific complete strings #####' \ + -e 's|\$\(CPP\)·\$\(CFLAGS\)·\$\(AM_CPPFLAGS\)·\$\(CPPFLAGS\)·|$(CPP) $(sd.ALL_CPPFLAGS) |g' \ + -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ + -e '#### General cases #################' \ -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ -e 's|^if (.*)|ifneq ($(\1),)|' \ + -e '/\bAM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' } |