sd-dhcp-client: use RFC4361-complient ClientID by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca5d3ba173e4a62ba78ad312586ea8680a2e0aa6..2b7ee6f4789541d41eb6f06f374c0040bbdb3539 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
 
@@ -5253,17 +5260,34 @@ 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_import_SOURCES = \
-       src/import/import.c \
+systemd_importd_SOURCES = \
+       src/import/importd.c
+
+systemd_importd_CFLAGS = \
+       $(AM_CFLAGS) \
+       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
+
+systemd_importd_LDADD = \
+       libsystemd-internal.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 +5296,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 +5305,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 +5314,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 +5324,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 +5372,6 @@ test_qcow2_LDADD = \
        libsystemd-shared.la \
        $(ZLIB_LIBS)
 
-dist_rootlibexec_DATA = \
-       src/import/import-pubring.gpg
 endif
 endif
 endif