X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=37ea845ed433bd6e92466a6f6d20ca4b30e8732a;hp=225938d66091f4a0b85d75db836f4e6306b3fac2;hb=1c7dd82563ff2e71a067aea20d2acb2d0553644b;hpb=d15d0333be6a1ca7fdd99a1881d967b6be8f387a

diff --git a/Makefile.am b/Makefile.am
index 225938d66..37ea845ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -368,6 +368,7 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
+	systemd-stdio-bridge \
 	systemd-path
 
 dist_bin_SCRIPTS = \
@@ -982,6 +983,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
@@ -1336,6 +1355,11 @@ manual_tests += \
 	test-ipcrm \
 	test-btrfs
 
+if HAVE_LIBIPTC
+manual_tests += \
+	test-fw-util
+endif
+
 if HAVE_KMOD
 manual_tests += \
 	test-rtnl-manual
@@ -1815,6 +1839,20 @@ test_btrfs_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+if HAVE_LIBIPTC
+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)
+endif
+
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
 
@@ -1986,11 +2024,10 @@ test_conf_files_LDADD = \
 	libsystemd-shared.la
 
 test_bus_policy_SOURCES = \
-	src/bus-proxyd/test-bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.h
+	src/bus-proxyd/test-bus-xml-policy.c
 
 test_bus_policy_LDADD = \
+	libsystemd-proxy.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -2627,6 +2664,11 @@ systemd_nspawn_LDADD += \
 	$(SECCOMP_LIBS)
 endif
 
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+	libsystemd-fw.la
+endif
+
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
 	src/run/run.c
@@ -2637,46 +2679,67 @@ systemd_run_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-systemd_bus_proxyd_SOURCES = \
-	src/bus-proxyd/bus-proxyd.c \
+noinst_LTLIBRARIES += \
+	libsystemd-proxy.la
+
+libsystemd_proxy_la_SOURCES = \
 	src/bus-proxyd/bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.h
+	src/bus-proxyd/bus-xml-policy.h \
+	src/bus-proxyd/driver.c \
+	src/bus-proxyd/driver.h \
+	src/bus-proxyd/proxy.c \
+	src/bus-proxyd/proxy.h \
+	src/bus-proxyd/synthesize.c \
+	src/bus-proxyd/synthesize.h
+
+libsystemd_proxy_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
 
-systemd_bus_proxyd_LDADD = \
+libsystemd_proxy_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-bus-proxyd-install-hook:
-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
-	$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+systemd_bus_proxyd_SOURCES = \
+	src/bus-proxyd/bus-proxyd.c
+
+systemd_bus_proxyd_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
 
-bus-proxyd-uninstall-hook:
-	rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+systemd_bus_proxyd_LDADD = \
+	libsystemd-proxy.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
-INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
-UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+systemd_stdio_bridge_SOURCES = \
+	src/bus-proxyd/stdio-bridge.c
+
+systemd_stdio_bridge_LDADD = \
+	libsystemd-proxy.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 if ENABLE_KDBUS
 nodist_systemunit_DATA += \
-	units/systemd-bus-proxyd@.service
+	units/systemd-bus-proxyd.service
 
 dist_systemunit_DATA += \
 	units/systemd-bus-proxyd.socket
 
 nodist_userunit_DATA += \
-	units/user/systemd-bus-proxyd@.service
+	units/user/systemd-bus-proxyd.service
 
 dist_userunit_DATA += \
 	units/user/systemd-bus-proxyd.socket
 endif
 
 EXTRA_DIST += \
-	units/systemd-bus-proxyd@.service.m4.in \
-	units/user/systemd-bus-proxyd@.service.in
+	units/systemd-bus-proxyd.service.m4.in \
+	units/user/systemd-bus-proxyd.service.in
 
 CLEANFILES += \
-	units/systemd-bus-proxyd@.service.m4
+	units/systemd-bus-proxyd.service.m4
 
 if HAVE_SMACK
 bus-proxyd-set-cap-hook:
@@ -4437,6 +4500,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
 
@@ -5179,24 +5243,51 @@ 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 \
 	src/import/curl-util.h \
 	src/import/aufs-util.c \
-	src/import/aufs-util.h
+	src/import/aufs-util.h \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
 
 systemd_import_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(LIBCURL_CFLAGS)
+	$(LIBCURL_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 systemd_import_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	$(LIBCURL_LIBS)
+	$(LIBCURL_LIBS) \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS)
+
+endif
+
+if HAVE_ZLIB
+manual_tests += \
+	test-qcow2
+
+test_qcow2_SOURCES = \
+	src/import/test-qcow2.c \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
+
+test_qcow2_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ZLIB_CFLAGS)
+
+test_qcow2_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	$(ZLIB_LIBS)
 endif
 
 endif
@@ -5369,6 +5460,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
 
@@ -5459,6 +5555,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
@@ -5467,6 +5568,11 @@ test_network_tables_LDADD = \
 	libsystemd-networkd-core.la \
 	libudev-core.la
 
+if HAVE_LIBIPTC
+test_network_tables_LDADD += \
+	libsystemd-fw.la
+endif
+
 tests += \
 	test-network \
 	test-network-tables