chiark / gitweb /
Makefile: fix build on clang
[elogind.git] / Makefile.am
index c71367d..0b879f1 100644 (file)
@@ -87,7 +87,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-networkdir=$(prefix)/lib/systemd/network
+networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -646,8 +646,7 @@ EXTRA_DIST += \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/make-man-rules.py \
-       tools/xml_helper.py \
-       man/less-variables.xml
+       tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -674,6 +673,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/util.h \
        src/shared/virt.c \
        src/shared/virt.h \
+       src/shared/architecture.c \
+       src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
        src/shared/path-util.c \
@@ -766,7 +767,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
-       src/shared/xml.h
+       src/shared/xml.h \
+       src/shared/condition-util.c \
+       src/shared/condition-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1016,6 +1019,7 @@ libsystemd_core_la_CFLAGS = \
        $(AUDIT_CFLAGS) \
        $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
+       $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
@@ -1031,6 +1035,7 @@ libsystemd_core_la_LIBADD = \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
        $(KMOD_LIBS) \
+       $(APPARMOR_LIBS) \
        $(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1148,7 +1153,8 @@ tests += \
        test-list \
        test-tables \
        test-device-nodes \
-       test-xml
+       test-xml \
+       test-architecture
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1296,6 +1302,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
        libsystemd-core.la
 
+test_architecture_SOURCES = \
+       src/test/test-architecture.c
+
+test_architecture_LDADD = \
+       libsystemd-shared.la
+
 test_log_SOURCES = \
        src/test/test-log.c
 
@@ -1726,6 +1738,9 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
        bootctl
 
+dist_bashcompletion_DATA += \
+       shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
 
@@ -1868,9 +1883,13 @@ systemd_nspawn_LDADD = \
        libsystemd-capability.la \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
+       libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
        libsystemd-seccomp.la \
        $(SECCOMP_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1997,6 +2016,9 @@ libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
+libsystemd_internal_la_LIBADD = \
+       $(RT_LIBS)
+
 noinst_LTLIBRARIES += \
        libsystemd-internal.la
 
@@ -2047,6 +2069,20 @@ libsystemd_la_LIBADD = \
        $(RT_LIBS) \
        -lresolv
 
+libsystemd-install-hook:
+       libname=libsystemd.so && $(move-to-rootlibdir)
+       -$(MKDIR_P) $(DESTDIR)/var/log/journal
+       -chown 0:0 $(DESTDIR)/var/log/journal
+       -chmod 755 $(DESTDIR)/var/log/journal
+       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
+
+libsystemd-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
 pkgconfiglib_DATA += \
        src/libsystemd/libsystemd.pc
 
@@ -3909,7 +3945,8 @@ systemd_networkd_SOURCES = \
        src/network/networkd-manager.c
 
 nodist_systemd_networkd_SOURCES = \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
@@ -3921,8 +3958,8 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
        units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-       systemd-networkd.service
+GENERAL_ALIASES += \
+       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
 test_network_SOURCES = \
        src/network/test-network.c \
@@ -3933,7 +3970,8 @@ test_network_SOURCES = \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 test_network_LDADD = \
        libudev-internal.la \
@@ -3946,11 +3984,13 @@ tests += \
        test-network
 
 EXTRA_DIST += \
-       src/network/networkd-gperf.gperf \
+       src/network/networkd-network-gperf.gperf \
+       src/network/networkd-netdev-gperf.gperf \
        units/systemd-networkd.service.in
 
 CLEANFILES += \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------
@@ -4231,7 +4271,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _daemon_la_SOURCES = \
        src/python-systemd/_daemon.c \
@@ -4252,7 +4293,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \