X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=dd9ba96d93267935049617514f96adc910594169;hb=ee57a737a5b72bc3f3f46aafd2bbc452b61dcaa7;hp=ac90c1890cdb712dd5a2bfe743fa5f07d7ed52c0;hpb=95fe27d9307628a4a593e63794000c09ecb91b95;p=elogind.git diff --git a/Makefile.am b/Makefile.am index ac90c1890..dd9ba96d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ @@ -774,6 +775,10 @@ nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h +libsystemd_shared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-units.la @@ -816,7 +821,6 @@ libsystemd_label_la_LIBADD = \ # ------------------------------------------------------------------------------ if HAVE_SECCOMP - noinst_LTLIBRARIES += \ libsystemd-seccomp.la @@ -830,7 +834,6 @@ libsystemd_seccomp_la_CFLAGS = \ libsystemd_seccomp_la_LIBADD = \ $(SECCOMP_LIBS) - endif # ------------------------------------------------------------------------------ @@ -1018,6 +1021,7 @@ libsystemd_core_la_CFLAGS = \ $(AUDIT_CFLAGS) \ $(CAP_CFLAGS) \ $(KMOD_CFLAGS) \ + $(APPARMOR_CFLAGS) \ $(SECCOMP_CFLAGS) \ -pthread @@ -1033,6 +1037,7 @@ libsystemd_core_la_LIBADD = \ $(AUDIT_LIBS) \ $(CAP_LIBS) \ $(KMOD_LIBS) \ + $(APPARMOR_LIBS) \ $(SECCOMP_LIBS) if HAVE_SECCOMP @@ -1078,6 +1083,10 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt systemd_SOURCES = \ src/core/main.c +systemd_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + systemd_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1150,7 +1159,8 @@ tests += \ test-list \ test-tables \ test-device-nodes \ - test-xml + test-xml \ + test-architecture EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1174,6 +1184,10 @@ test_device_nodes_LDADD = \ test_engine_SOURCES = \ src/test/test-engine.c +test_engine_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_engine_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1181,6 +1195,10 @@ test_engine_LDADD = \ test_job_type_SOURCES = \ src/test/test-job-type.c +test_job_type_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_job_type_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1188,6 +1206,10 @@ test_job_type_LDADD = \ test_ns_SOURCES = \ src/test/test-ns.c +test_ns_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_ns_LDADD = \ libsystemd-core.la @@ -1217,6 +1239,10 @@ endif test_unit_name_SOURCES = \ src/test/test-unit-name.c +test_unit_name_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_unit_name_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1224,6 +1250,10 @@ test_unit_name_LDADD = \ test_unit_file_SOURCES = \ src/test/test-unit-file.c +test_unit_file_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_unit_file_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1274,6 +1304,10 @@ test_tables_SOURCES = \ src/test/test-tables.c \ src/shared/test-tables.h +test_tables_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_tables_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ @@ -1298,6 +1332,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 @@ -1361,6 +1401,10 @@ test_cgroup_mask_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" +test_cgroup_mask_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_cgroup_mask_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1427,6 +1471,10 @@ test_sched_prio_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" +test_sched_prio_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_sched_prio_LDADD = \ libsystemd-core.la \ $(RT_LIBS) @@ -1873,9 +1921,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 = \ @@ -2002,6 +2054,9 @@ libsystemd_internal_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_internal_la_LIBADD = \ + $(RT_LIBS) + noinst_LTLIBRARIES += \ libsystemd-internal.la @@ -2054,11 +2109,6 @@ libsystemd_la_LIBADD = \ 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* @@ -2152,6 +2202,10 @@ test_bus_chat_LDADD = \ test_bus_cleanup_SOURCES = \ src/libsystemd/sd-bus/test-bus-cleanup.c +test_bus_cleanup_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + test_bus_cleanup_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la @@ -2452,7 +2506,8 @@ INSTALL_DIRS += \ $(sysconfdir)/udev/hwdb.d dist_network_DATA = \ - network/99-default.link + network/99-default.link \ + network/80-container-host0.network dist_udevrules_DATA += \ rules/99-systemd.rules \ @@ -3138,8 +3193,20 @@ endif noinst_LTLIBRARIES += \ libsystemd-journal-core.la -# ------------------------------------------------------------------------------ +journal-install-hook: + -$(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/ + +journal-uninstall-hook: + -rmdir $(DESTDIR)/var/log/journal/ + +INSTALL_EXEC_HOOKS += journal-install-hook +UNINSTALL_EXEC_HOOKS += journal-uninstall-hook +# ------------------------------------------------------------------------------ # Update catalog on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. catalog-update-hook: @@ -3941,8 +4008,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 \ @@ -4464,11 +4531,13 @@ pkgconfiglib_DATA += \ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed compat-lib-install-hook: libname=libsystemd-login.so && $(move-to-rootlibdir) + libname=libsystemd-journal.so && $(move-to-rootlibdir) libname=libsystemd-id128.so && $(move-to-rootlibdir) libname=libsystemd-daemon.so && $(move-to-rootlibdir) compat-lib-uninstall-hook: rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*