rules: systemd - remove legacy "ram" from block device blacklist

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 42183f45d7f19e75d2022e39279dc9f902832f02..9b29ecf3336d0d6509c82c952d859002e61f818e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -908,7 +908,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sigbus.h \
        src/shared/build.h \
        src/shared/import-util.c \
-       src/shared/import-util.h
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -3685,6 +3687,7 @@ dist_network_DATA = \
 dist_udevrules_DATA += \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
+       rules/60-block.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
        rules/60-persistent-storage-tape.rules \
@@ -5371,7 +5374,8 @@ if HAVE_GCRYPT
 rootlibexec_PROGRAMS += \
        systemd-importd \
        systemd-pull \
-       systemd-import
+       systemd-import \
+       systemd-export
 
 systemd_importd_SOURCES = \
        src/import/importd.c
@@ -5379,7 +5383,8 @@ systemd_importd_SOURCES = \
 systemd_importd_CFLAGS = \
        $(AM_CFLAGS) \
        -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
-       -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\"
+       -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+       -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
 
 systemd_importd_LDADD = \
        libsystemd-internal.la \
@@ -5454,6 +5459,30 @@ systemd_import_LDADD = \
        $(ZLIB_LIBS) \
        -lbz2
 
+systemd_export_SOURCES = \
+       src/import/export.c \
+       src/import/export-tar.c \
+       src/import/export-tar.h \
+       src/import/export-raw.c \
+       src/import/export-raw.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
+       src/import/import-compress.c \
+       src/import/import-compress.h
+
+systemd_export_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XZ_CFLAGS) \
+       $(ZLIB_CFLAGS)
+
+systemd_export_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(XZ_LIBS) \
+       $(ZLIB_LIBS) \
+       -lbz2
+
 dist_rootlibexec_DATA = \
        src/import/import-pubring.gpg