X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e9fca3f1fea6ad9248c402f4d01eca406072c216;hb=6afc95b73605833e6e966af1c466b5c08feb953f;hp=49ac55fee19c02dec1788599834ffca1ddca6bd3;hpb=65b3903ff576488eaabb51d3c4fbf9c73d867d7c;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 49ac55fee..e9fca3f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -351,6 +351,7 @@ dist_bashcompletion_DATA = \ shell-completion/bash/journalctl \ shell-completion/bash/systemctl \ shell-completion/bash/systemd-analyze \ + shell-completion/bash/systemd-delta \ shell-completion/bash/systemd-run \ shell-completion/bash/udevadm \ shell-completion/bash/kernel-install @@ -610,16 +611,16 @@ XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml) NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES)) SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES)) -update-man-list: make-man-rules.py $(XML_GLOB) +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am @echo "Makefile-man.am has been regenerated" -man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES) +man/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 $<,$^) -man/systemd.directives.xml: make-directive-index.py $(SOURCE_XML_FILES) +man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE_XML_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^) @@ -641,9 +642,11 @@ EXTRA_DIST += \ $(HTML_FILES) \ $(HTML_ALIAS) \ $(man_MANS) \ - make-man-index.py \ - make-directive-index.py \ - xml_helper.py + tools/make-man-index.py \ + tools/make-directive-index.py \ + tools/make-man-rules.py \ + tools/xml_helper.py \ + man/less-variables.xml # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -652,8 +655,6 @@ noinst_LTLIBRARIES += \ libsystemd_shared_la_SOURCES = \ src/shared/linux/auto_dev-ioctl.h \ src/shared/linux/fanotify.h \ - src/shared/linux/seccomp.h \ - src/shared/linux/seccomp-bpf.h \ src/shared/ioprio.h \ src/shared/missing.h \ src/shared/initreq.h \ @@ -761,8 +762,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/net-util.h \ src/shared/errno-list.c \ src/shared/errno-list.h \ - src/shared/syscall-list.c \ - src/shared/syscall-list.h \ src/shared/audit.c \ src/shared/audit.h \ src/shared/xml.c \ @@ -770,9 +769,7 @@ libsystemd_shared_la_SOURCES = \ nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ - src/shared/errno-to-name.h \ - src/shared/syscall-from-name.h \ - src/shared/syscall-to-name.h + src/shared/errno-to-name.h # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -813,6 +810,26 @@ libsystemd_label_la_CFLAGS = \ libsystemd_label_la_LIBADD = \ $(SELINUX_LIBS) +# ------------------------------------------------------------------------------ + +if HAVE_SECCOMP + +noinst_LTLIBRARIES += \ + libsystemd-seccomp.la + +libsystemd_seccomp_la_SOURCES = \ + src/shared/seccomp-util.h \ + src/shared/seccomp-util.c + +libsystemd_seccomp_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + +libsystemd_seccomp_la_LIBADD = \ + $(SECCOMP_LIBS) + +endif + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-logs.la @@ -996,7 +1013,9 @@ libsystemd_core_la_CFLAGS = \ $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ + $(CAP_CFLAGS) \ $(KMOD_CFLAGS) \ + $(SECCOMP_CFLAGS) \ -pthread libsystemd_core_la_LIBADD = \ @@ -1011,7 +1030,13 @@ libsystemd_core_la_LIBADD = \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ $(CAP_LIBS) \ - $(KMOD_LIBS) + $(KMOD_LIBS) \ + $(SECCOMP_LIBS) + +if HAVE_SECCOMP +libsystemd_core_la_LIBADD += \ + libsystemd-seccomp.la +endif src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1024,33 +1049,13 @@ CLEANFILES += \ src/core/load-fragment-gperf.gperf \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c \ - src/shared/syscall-list.txt \ - src/shared/syscall-from-name.gperf \ src/shared/errno-list.txt \ src/shared/errno-from-name.gperf BUILT_SOURCES += \ - src/shared/syscall-from-name.h \ - src/shared/syscall-to-name.h \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h -src/shared/syscall-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@ - -src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ - -src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ - -src/shared/syscall-to-name.h: src/shared/syscall-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ - src/shared/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@ @@ -1765,6 +1770,7 @@ systemd_dbus1_generator_LDADD = \ libsystemd-internal.la dbus1-generator-install-hook: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator dbus1-generator-uninstall-hook: @@ -1860,12 +1866,19 @@ systemd_nspawn_SOURCES = \ src/core/loopback-setup.c \ src/core/loopback-setup.h +systemd_nspawn_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libudev-internal.la \ + libsystemd-shared.la \ + libsystemd-seccomp.la \ + $(SECCOMP_LIBS) # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -1888,6 +1901,7 @@ systemd_bus_proxyd_LDADD = \ libsystemd-shared.la bus-proxyd-install-hook: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge bus-proxyd-uninstall-hook: @@ -2039,12 +2053,12 @@ nodist_libsystemd_la_SOURCES = \ libsystemd_la_LIBADD = \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lresolv libsystemd_la_CFLAGS = \ $(AM_CFLAGS) \ - -pthread \ - -lresolv + -pthread libsystemd_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -2316,7 +2330,8 @@ test_resolve_SOURCES = \ test_resolve_LDADD = \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lresolv test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -2344,8 +2359,11 @@ noinst_LTLIBRARIES += \ libsystemd_dhcp_la_SOURCES = \ src/systemd/sd-dhcp-client.h \ src/libsystemd-dhcp/sd-dhcp-client.c \ + src/libsystemd-dhcp/dhcp-lease.h \ + src/libsystemd-dhcp/dhcp-lease.c \ src/libsystemd-dhcp/dhcp-network.c \ src/libsystemd-dhcp/dhcp-option.c \ + src/libsystemd-dhcp/dhcp-packet.c \ src/libsystemd-dhcp/dhcp-internal.h \ src/libsystemd-dhcp/dhcp-protocol.h @@ -3958,6 +3976,9 @@ machinectl_LDADD = \ rootbin_PROGRAMS += \ machinectl +dist_bashcompletion_DATA += \ + shell-completion/bash/machinectl + test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c @@ -4481,9 +4502,7 @@ libsystemd_id128_la_SOURCES = \ src/compat-libs/libsystemd-id128.sym libsystemd_id128_la_CFLAGS = \ - $(AM_CFLAGS) \ - -fvisibility=default \ - -imacros $(top_srcdir)/src/compat-libs/linkwarning.h + $(libsystemd_login_la_CFLAGS) libsystemd_id128_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4642,7 +4661,7 @@ if ENABLE_MANPAGES man/custom-entities.ent: $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '' && \ - echo '$(subst '|,,$(substitutions))))') \ + printf '$(subst '|,\n,$(substitutions))))') \ > $@ # ' DISTCLEANFILES += \ @@ -4650,6 +4669,7 @@ DISTCLEANFILES += \ XSLTPROC_FLAGS = \ --nonet \ + --xinclude \ --stringparam man.output.quietly 1 \ --stringparam funcsynopsis.style ansi \ --stringparam man.authors.section.enabled 0 \ @@ -4935,6 +4955,14 @@ CLEANFILES += \ check-api-unused: defined undefined exported ( cat exported undefined ) | sort -u | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2- +.PHONY: check-includes +check-includes: $(top_srcdir)/tools/check-includes.pl + $(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \ + | xargs $(top_srcdir)/tools/check-includes.pl + +EXTRA_DIST += \ + $(top_srcdir)/tools/check-includes.pl + # Stupid test that everything purported to be exported really is define generate-sym-test