remove unneeded libgen.h includes

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee73598cb18e26ade954d5edfa1b3f6ded9c4f00..20f760c5b694aeda15bac2ae242910a8eab375bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -391,6 +391,7 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep \
        systemd-bus-proxyd \
+       systemd-stdio-bridge \
        systemd-socket-proxyd \
        systemd-update-done
 
@@ -2023,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
 
@@ -2679,29 +2679,38 @@ 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/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
 
-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_LDADD = \
+       libsystemd-proxy.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
-bus-proxyd-uninstall-hook:
-       rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+systemd_stdio_bridge_SOURCES = \
+       src/bus-proxyd/stdio-bridge.c
 
-INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
-UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+systemd_stdio_bridge_LDADD = \
+       libsystemd-proxy.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 if ENABLE_KDBUS
 nodist_systemunit_DATA += \
@@ -5233,19 +5242,43 @@ systemd_import_SOURCES = \
        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) \
-       $(XZ_CFLAGS)
+       $(XZ_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 systemd_import_LDADD = \
        libsystemd-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        $(LIBCURL_LIBS) \
-       $(XZ_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-shared.la \
+       $(ZLIB_LIBS)
 endif
 
 endif