journald: move /dev/log socket to /run

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5158bbc776d51695cc23a382e0ecf7c3b687482b..110937781ae8b6f9a54606de3ee602fb6502340e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2033,6 +2033,7 @@ systemd_bus_proxyd_SOURCES = \
        src/bus-proxyd/bus-proxyd.c
 
 systemd_bus_proxyd_LDADD = \
        src/bus-proxyd/bus-proxyd.c
 
 systemd_bus_proxyd_LDADD = \

+       libsystemd-capability.la \

        libsystemd-internal.la \
        libsystemd-shared.la
 
        libsystemd-internal.la \
        libsystemd-shared.la
 


@@ -3479,7 +3480,8 @@ bin_PROGRAMS += \
        systemd-cat
 
 dist_systemunit_DATA += \
        systemd-cat
 
 dist_systemunit_DATA += \

-       units/systemd-journald.socket
+       units/systemd-journald.socket \
+       units/systemd-journald-dev-log.socket

 
 nodist_systemunit_DATA += \
        units/systemd-journald.service \
 
 nodist_systemunit_DATA += \
        units/systemd-journald.service \


@@ -3495,7 +3497,9 @@ dist_catalog_DATA = \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \

-       systemd-journald.socket
+       systemd-journald.socket \
+       systemd-journald-dev-log.socket
+

 SYSINIT_TARGET_WANTS += \
        systemd-journald.service \
        systemd-journal-flush.service
 SYSINIT_TARGET_WANTS += \
        systemd-journald.service \
        systemd-journal-flush.service


@@ -4215,6 +4219,7 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \

+       libsystemd-capability.la \

        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \


@@ -4253,15 +4258,13 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \

-       libsystemd-capability.la \
-       $(KMOD_LIBS)
+       libsystemd-capability.la

 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_CFLAGS = \
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_CFLAGS = \

-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)

 
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
 
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \


@@ -4269,6 +4272,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-tunnel.c \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-tunnel.c \

+       src/network/networkd-veth.c \

        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \


@@ -4289,8 +4293,7 @@ rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \

-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)

 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \


@@ -4307,12 +4310,10 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_CFLAGS = \
        src/network/test-network.c
 
 test_network_CFLAGS = \

-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)

 
 test_network_LDADD = \
        libsystemd-networkd-core.la
 
 test_network_LDADD = \
        libsystemd-networkd-core.la

-       $(KMOD_LIBS)

 
 tests += \
        test-network
 
 tests += \
        test-network