X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=856accb0d6cb34dd9a65a6d019afbb5412a0d6f1;hp=42183f45d7f19e75d2022e39279dc9f902832f02;hb=f436aa11f72e69e7b19cb4d73c78716296e3e417;hpb=9e4ded3064e9a683e004ff8f6a8ce53ac20b79d7

diff --git a/Makefile.am b/Makefile.am
index 42183f45d..856accb0d 100644
--- 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,21 +3687,20 @@ 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 \
-	rules/60-persistent-serial.rules \
 	rules/60-persistent-input.rules \
 	rules/60-persistent-alsa.rules \
 	rules/60-persistent-storage.rules \
+	rules/60-serial.rules \
 	rules/64-btrfs.rules \
 	rules/70-mouse.rules \
 	rules/70-touchpad.rules \
 	rules/75-net-description.rules \
-	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
-	rules/80-net-setup-link.rules \
-	rules/95-udev-late.rules
+	rules/80-net-setup-link.rules
 
 nodist_udevrules_DATA += \
 	rules/99-systemd.rules
@@ -5371,7 +5372,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 +5381,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 +5457,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