Fix ordering of the 70-mouse.rule in the Makefile

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca5d3ba173e4a62ba78ad312586ea8680a2e0aa6..80c41615e68dc4301c5e20e55c13ae1ef47969df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -902,7 +902,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/verbs.h \
        src/shared/sigbus.c \
        src/shared/sigbus.h \
-       src/shared/build.h
+       src/shared/build.h \
+       src/shared/import-util.c \
+       src/shared/import-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -2191,6 +2193,11 @@ systemd_tmpfiles_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+if HAVE_ACL
+systemd_tmpfiles_LDADD += \
+       libsystemd-acl.la
+endif
+
 rootbin_PROGRAMS += \
        systemd-tmpfiles
 
@@ -3319,7 +3326,7 @@ noinst_PROGRAMS += \
        systemd-subterm
 
 dist_pkgdata_DATA += \
-       src/libsystemd-terminal/unifont-glyph-array.bin
+       src/libsystemd-terminal/unifont-glyph-array.bin
 
 nodist_userunit_DATA += \
        units/user/systemd-consoled.service
@@ -3447,12 +3454,8 @@ test_unifont_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
-.PHONY: update-unifont
-update-unifont: tools/compile-unifont.py
-       $(AM_V_GEN)$(PYTHON) $< \
-               <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
-               >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
-       @echo "unifont-glyph-array.bin has been regenerated"
+src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
+       $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -3550,13 +3553,13 @@ dist_udevrules_DATA += \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
-       rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
        rules/60-persistent-storage.rules \
        rules/64-btrfs.rules \
+       rules/70-mouse.rules \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
@@ -5253,17 +5256,35 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
        libnss_mymachines.la
 
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_IMPORTD
+
 if HAVE_LIBCURL
 if HAVE_XZ
 if HAVE_ZLIB
 if HAVE_BZIP2
 if HAVE_GCRYPT
 
-bin_PROGRAMS += \
-       systemd-import
+rootlibexec_PROGRAMS += \
+       systemd-importd \
+       systemd-pull
+
+systemd_importd_SOURCES = \
+       src/import/importd.c
+
+systemd_importd_CFLAGS = \
+       $(AM_CFLAGS) \
+       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
 
-systemd_import_SOURCES = \
-       src/import/import.c \
+systemd_importd_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+systemd_pull_SOURCES = \
+       src/import/pull.c \
        src/import/import-raw.c \
        src/import/import-raw.h \
        src/import/import-tar.c \
@@ -5272,8 +5293,8 @@ systemd_import_SOURCES = \
        src/import/import-dkr.h \
        src/import/import-job.c \
        src/import/import-job.h \
-       src/import/import-util.c \
-       src/import/import-util.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
        src/import/curl-util.c \
        src/import/curl-util.h \
        src/import/aufs-util.c \
@@ -5281,7 +5302,7 @@ systemd_import_SOURCES = \
        src/import/qcow2-util.c \
        src/import/qcow2-util.h
 
-systemd_import_CFLAGS = \
+systemd_pull_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(XZ_CFLAGS) \
@@ -5290,7 +5311,7 @@ systemd_import_CFLAGS = \
        -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
        -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
 
-systemd_import_LDADD = \
+systemd_pull_LDADD = \
        libsystemd-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la \
@@ -5300,6 +5321,36 @@ systemd_import_LDADD = \
        -lbz2 \
        $(GCRYPT_LIBS)
 
+dist_rootlibexec_DATA = \
+       src/import/import-pubring.gpg
+
+nodist_systemunit_DATA += \
+       units/systemd-importd.service
+
+EXTRA_DIST += \
+       units/systemd-importd.service.in
+
+dist_systemunit_DATA_busnames += \
+       units/org.freedesktop.import1.busname
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.import1.busname
+
+SYSTEM_UNIT_ALIASES += \
+       systemd-importd.service dbus-org.freedesktop.import1.service
+
+dist_dbussystemservice_DATA += \
+       src/import/org.freedesktop.import1.service
+
+dist_dbuspolicy_DATA += \
+       src/import/org.freedesktop.import1.conf
+
+polkitpolicy_files += \
+       src/import/org.freedesktop.import1.policy
+
+polkitpolicy_in_files += \
+       src/import/org.freedesktop.import1.policy.in
+
 manual_tests += \
        test-qcow2
 
@@ -5318,8 +5369,6 @@ test_qcow2_LDADD = \
        libsystemd-shared.la \
        $(ZLIB_LIBS)
 
-dist_rootlibexec_DATA = \
-       src/import/import-pubring.gpg
 endif
 endif
 endif
@@ -6167,6 +6216,7 @@ substitutions = \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
        '|SUSHELL=$(SUSHELL)|' \
+       '|SULOGIN=$(SULOGIN)|' \
        '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
        '|KMOD=$(KMOD)|' \
@@ -6506,7 +6556,7 @@ endif
 #
 # Require python when making dist
 #
-.PHONY: dist-check-python
+.PHONY: dist-check-python dist-check-compat-libs dist-check-help
 dist-check-python:
 if !HAVE_PYTHON
        @echo "*** python and python-lxml module must be installed and enabled in order to make dist"
@@ -6519,6 +6569,14 @@ if !ENABLE_COMPAT_LIBS
        @false
 endif
 
+dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
+       for i in $(abspath $^); do                                             \
+            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
+               echo "$(basename $$i) --help output is too wide:";             \
+               $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
+               exit 1;                                                        \
+            fi; done
+
 dist: dist-check-python dist-check-compat-libs
 
 # check "broken" platforms limited toolchains for link breakage before we release