diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index de8b556683..5652a899a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -725,8 +725,8 @@ SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directi # This target should only be run manually. It recreates Makefile-man.am # file in the source directory based on all man/*.xml files. Run it after # adding, removing, or changing the conditional in a man page. -update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) - $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent + $(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(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" @@ -1138,8 +1138,6 @@ libcore_la_SOURCES = \ src/core/bus-policy.h \ src/core/target.c \ src/core/target.h \ - src/core/snapshot.c \ - src/core/snapshot.h \ src/core/device.c \ src/core/device.h \ src/core/mount.c \ @@ -1178,8 +1176,6 @@ libcore_la_SOURCES = \ src/core/dbus-busname.h \ src/core/dbus-target.c \ src/core/dbus-target.h \ - src/core/dbus-snapshot.c \ - src/core/dbus-snapshot.h \ src/core/dbus-device.c \ src/core/dbus-device.h \ src/core/dbus-mount.c \ @@ -1498,7 +1494,8 @@ tests += \ test-verbs \ test-af-list \ test-arphrd-list \ - test-dns-domain + test-dns-domain \ + test-install-root EXTRA_DIST += \ test/a.service \ @@ -1551,6 +1548,10 @@ EXTRA_DIST += \ test/test-execute/exec-environment-empty.service \ test/test-execute/exec-environment-multiple.service \ test/test-execute/exec-environment.service \ + test/test-execute/exec-passenvironment-absent.service \ + test/test-execute/exec-passenvironment-empty.service \ + test/test-execute/exec-passenvironment-repeated.service \ + test/test-execute/exec-passenvironment.service \ test/test-execute/exec-group.service \ test/test-execute/exec-ignoresigpipe-no.service \ test/test-execute/exec-ignoresigpipe-yes.service \ @@ -1837,6 +1838,12 @@ test_verbs_SOURCES = \ test_verbs_LDADD = \ libshared.la +test_install_root_SOURCES = \ + src/test/test-install-root.c + +test_install_root_LDADD = \ + libshared.la + test_namespace_LDADD = \ libcore.la @@ -6183,9 +6190,9 @@ hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \ wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \ - wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \ - wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \ - wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \ + wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \ + wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \ + wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \ ./ids-update.pl ) .PHONY: built-sources |