Merge pull request #1918 from dvdhrm/user3

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a601265d78b745dab5c959bbb5f9146e14133335..1a5857263b44a110e1a8d3dbc81d02df67ef253b 100644 (file)
--- 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 \
@@ -1497,7 +1493,8 @@ tests += \
        test-verbs \
        test-af-list \
        test-arphrd-list \
-       test-dns-domain
+       test-dns-domain \
+       test-install-root
 
 EXTRA_DIST += \
        test/a.service \
@@ -1506,7 +1503,7 @@ EXTRA_DIST += \
        test/c.service \
        test/daughter.service \
        test/d.service \
-       test/end.service.in \
+       test/end.service \
        test/e.service \
        test/f.service \
        test/grandchild.service \
@@ -1550,6 +1547,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 \
@@ -1836,6 +1837,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
 
@@ -3305,7 +3312,6 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-ndisc.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
-       src/systemd/sd-pppoe.h \
        src/systemd/sd-lldp.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
@@ -3321,7 +3327,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-ipv4acd.c \
        src/libsystemd-network/arp-util.h \
        src/libsystemd-network/arp-util.c \
-       src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-ndisc.c \
@@ -3402,14 +3407,6 @@ test_acd_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_pppoe_SOURCES = \
-       src/systemd/sd-pppoe.h \
-       src/libsystemd-network/test-pppoe.c
-
-test_pppoe_LDADD = \
-       libsystemd-network.la \
-       libshared.la
-
 test_ndisc_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-ndisc.h \
@@ -3454,9 +3451,6 @@ tests += \
        test-dhcp6-client \
        test-lldp
 
-manual_tests += \
-       test-pppoe
-
 # ------------------------------------------------------------------------------
 include_HEADERS += \
        src/libudev/libudev.h
@@ -6195,9 +6189,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