X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=985e8eff4954bc684a2c27e637ccf202818f3b00;hb=3146a302d184d64a5c75237129f9e4f54ce46cd3;hp=d8c7185fe749104b52c121f9a87a1704936a3733;hpb=cc9f61b81517655dd8451c96316384f8055d91e3;p=elogind.git diff --git a/Makefile.am b/Makefile.am index d8c7185fe..985e8eff4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,9 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po +# remove targets if the command fails +.DELETE_ON_ERROR: + LIBUDEV_CURRENT=1 LIBUDEV_REVISION=2 LIBUDEV_AGE=0 @@ -79,7 +82,7 @@ rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd -CLEANFILES = +CLEANFILES = BUILT_SOURCES EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = @@ -141,6 +144,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ + -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/libudev \ -I $(top_srcdir)/src/udev @@ -668,8 +672,12 @@ noinst_DATA += \ CLEANFILES += \ man/index.html -man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@ +$(builddir)/man/index.html: $(XML_FILES:.xml=.html) $(top_srcdir)/make-man-index.py + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ + +EXTRA_DIST += \ + man/index.html endif endif @@ -688,6 +696,8 @@ 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/missing.h \ src/shared/list.h \ src/shared/macro.h \ @@ -994,7 +1004,7 @@ libsystemd_core_la_LIBADD = \ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(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 ";" }' < $< > $@ || rm $@ + $(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 ";" }' < $< > $@ EXTRA_DIST += \ src/core/load-fragment-gperf.gperf.m4 @@ -1004,16 +1014,14 @@ CLEANFILES += \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c \ src/core/syscall-list.txt \ - src/core/syscall-from-name.gperf \ - src/core/syscall-from-name.h \ - src/core/syscall-to-name.h + src/core/syscall-from-name.gperf BUILT_SOURCES += \ src/core/syscall-from-name.h \ src/core/syscall-to-name.h src/core/syscall-list.txt: Makefile - $(AM_V_GEN)cpp -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ || rm $@ + $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile $(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 }' < $< > $@ @@ -1460,7 +1468,8 @@ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-shared.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1989,9 +1998,6 @@ EXTRA_DIST += \ src/gudev/seed-example-enum.js \ src/gudev/seed-example.js -CLEANFILES += \ - $(nodist_libgudev_1_0_la_SOURCES) - src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ @@ -2112,7 +2118,6 @@ EXTRA_DIST += \ src/udev/keymap/keyboard-force-release.sh.in CLEANFILES += \ - $(nodist_keymap_SOURCES) \ src/udev/keymap/keys.txt \ src/udev/keymap/keys-from-name.gperf \ src/udev/keymap/keyboard-force-release.sh @@ -2187,11 +2192,11 @@ dist_udevkeymapforcerel_DATA = \ keymaps-force-release/samsung-90x3a \ keymaps-force-release/common-volume-keys -src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h +src/udev/keymap/keys.txt: Makefile $(AM_V_at)mkdir -p src/udev/keymap - $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ + $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt +src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile @@ -3317,7 +3322,7 @@ SED_PROCESS = \ -e 's,@rootprefix\@,$(rootprefix),g' \ -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ -e 's,@sushell\@,$(sushell),g' \ - < $< > $@ || rm $@ + < $< > $@ units/%: units/%.in Makefile $(SED_PROCESS) @@ -3350,15 +3355,15 @@ src/%.c: src/%.gperf src/%: src/%.m4 $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) < $< > $@ M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ M4_PROCESS_USER = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) @@ -3414,7 +3419,7 @@ man/%.7: man/%.xml man/%.8: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.html: man/%.xml +man/%.html: man/%.xml man/custom-html.xsl $(XSLTPROC_PROCESS_HTML) CLEANFILES += \