X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=520c4e944e970756e9b0f8254c20eaa614dbd7ba;hp=83d28773c18c5d9a61f32a0890887f1b6b32fe20;hb=aceac2f0b652dff701e5815c51c2e372e8fee84d;hpb=4f1a33dd0d62171bbeac74859642b8ff0ab547b8

diff --git a/Makefile.am b/Makefile.am
index 83d28773c..520c4e944 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -769,6 +769,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/architecture.h \
 	src/shared/efivars.c \
 	src/shared/efivars.h \
+	src/shared/fstab-util.c \
+	src/shared/fstab-util.h \
 	src/shared/path-util.c \
 	src/shared/path-util.h \
 	src/shared/time-util.c \
@@ -980,6 +982,24 @@ libsystemd_label_la_LIBADD = \
 
 # -----------------------------------------------------------------------------
 
+if HAVE_LIBIPTC
+noinst_LTLIBRARIES += \
+	libsystemd-fw.la
+
+libsystemd_fw_la_SOURCES = \
+	src/shared/fw-util.h \
+	src/shared/fw-util.c
+
+libsystemd_fw_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBIPTC_CFLAGS)
+
+libsystemd_fw_la_LIBADD = \
+	$(LIBIPTC_LIBS)
+endif
+
+# -----------------------------------------------------------------------------
+
 if ENABLE_LDCONFIG
 dist_systemunit_DATA += \
 	units/ldconfig.service
@@ -1332,7 +1352,8 @@ manual_tests += \
 	test-watchdog \
 	test-log \
 	test-ipcrm \
-	test-btrfs
+	test-btrfs \
+	test-fw-util
 
 if HAVE_KMOD
 manual_tests += \
@@ -1367,6 +1388,7 @@ tests += \
 	test-calendarspec \
 	test-strip-tab-ansi \
 	test-cgroup-util \
+	test-fstab-util \
 	test-prioq \
 	test-fileio \
 	test-time \
@@ -1609,6 +1631,12 @@ test_fdset_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-internal.la
 
+test_fstab_util_SOURCES = \
+	src/test/test-fstab-util.c
+
+test_fstab_util_LDADD = \
+	libsystemd-shared.la
+
 test_ratelimit_SOURCES = \
 	src/test/test-ratelimit.c
 
@@ -1806,6 +1834,18 @@ test_btrfs_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+test_fw_util_SOURCES = \
+	src/test/test-fw-util.c
+
+test_fw_util_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBIPTC_CFLAGS)
+
+test_fw_util_LDADD = \
+	libsystemd-fw.la \
+	libsystemd-shared.la \
+	$(LIBIPTC_LIBS)
+
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
 
@@ -2618,6 +2658,11 @@ systemd_nspawn_LDADD += \
 	$(SECCOMP_LIBS)
 endif
 
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+	libsystemd-fw.la
+endif
+
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
 	src/run/run.c
@@ -3469,6 +3514,7 @@ dist_udevrules_DATA += \
 	rules/42-usb-hid-pm.rules \
 	rules/50-udev-default.rules \
 	rules/60-drm.rules \
+	rules/60-evdev_id.rules \
 	rules/60-keyboard.rules \
 	rules/70-mouse.rules \
 	rules/60-persistent-storage-tape.rules \
@@ -3552,6 +3598,7 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-builtin.c \
 	src/udev/udev-builtin-btrfs.c \
 	src/udev/udev-builtin-hwdb.c \
+	src/udev/udev-builtin-evdev_id.c \
 	src/udev/udev-builtin-input_id.c \
 	src/udev/udev-builtin-keyboard.c \
 	src/udev/udev-builtin-net_id.c \
@@ -4428,6 +4475,7 @@ dist_catalog_DATA = \
 	catalog/systemd.fr.catalog \
 	catalog/systemd.it.catalog \
 	catalog/systemd.pl.catalog \
+	catalog/systemd.pt_BR.catalog \
 	catalog/systemd.ru.catalog \
 	catalog/systemd.catalog
 
@@ -5170,8 +5218,8 @@ bin_PROGRAMS += \
 
 systemd_import_SOURCES = \
 	src/import/import.c \
-	src/import/import-gpt.c \
-	src/import/import-gpt.h \
+	src/import/import-raw.c \
+	src/import/import-raw.h \
 	src/import/import-dkr.c \
 	src/import/import-dkr.h \
 	src/import/curl-util.c \
@@ -5360,6 +5408,11 @@ systemd_networkd_SOURCES = \
 systemd_networkd_LDADD = \
 	libsystemd-networkd-core.la
 
+if HAVE_LIBIPTC
+systemd_networkd_LDADD += \
+	libsystemd-fw.la
+endif
+
 noinst_LTLIBRARIES += \
 	libsystemd-networkd-core.la
 
@@ -5450,6 +5503,11 @@ test_network_SOURCES = \
 test_network_LDADD = \
 	libsystemd-networkd-core.la
 
+if HAVE_LIBIPTC
+test_network_LDADD += \
+	libsystemd-fw.la
+endif
+
 test_network_tables_SOURCES = \
 	src/network/test-network-tables.c \
 	src/shared/test-tables.h