X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4bbe69ebafd181820f6dcff7f980ce1443e88d7b;hp=0b46a128a7c7be7bd817e0b3fe58a10cea9644b5;hb=c0395aeb903cde25bd9e81fba3334f63335fe0ef;hpb=5ac0162c3af95efa08a07b84ff62ad32842922c7 diff --git a/Makefile.am b/Makefile.am index 0b46a128a..4bbe69eba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,7 @@ sysvrcnddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log systemdstatedir=$(localstatedir)/lib/systemd catalogstatedir=$(systemdstatedir)/catalog +xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -768,6 +769,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/architecture.h \ src/shared/efivars.c \ src/shared/efivars.h \ + src/shared/fstab-util.c \ + src/shared/fstab-util.h \ src/shared/path-util.c \ src/shared/path-util.h \ src/shared/time-util.c \ @@ -885,8 +888,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/pty.h \ src/shared/async.c \ src/shared/async.h \ - src/shared/copy.c \ - src/shared/copy.h \ src/shared/base-filesystem.c \ src/shared/base-filesystem.h \ src/shared/memfd-util.c \ @@ -894,13 +895,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/uid-range.c \ src/shared/uid-range.h \ src/shared/nss-util.h \ - src/shared/btrfs-util.c \ - src/shared/btrfs-util.h \ - src/shared/btrfs-ctree.h \ src/shared/verbs.c \ src/shared/verbs.h \ - src/shared/machine-image.c \ - src/shared/machine-image.h \ src/shared/sigbus.c \ src/shared/sigbus.h \ src/shared/build.h @@ -927,7 +923,8 @@ libsystemd_shared_la_CFLAGS = \ -pthread libsystemd_shared_la_LIBADD = \ - $(CAP_LIBS) + $(CAP_LIBS) \ + -lm # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -967,7 +964,14 @@ libsystemd_label_la_SOURCES = \ src/shared/condition.c \ src/shared/condition.h \ src/shared/generator.h \ - src/shared/generator.c + src/shared/generator.c \ + src/shared/btrfs-util.c \ + src/shared/btrfs-util.h \ + src/shared/btrfs-ctree.h \ + src/shared/machine-image.c \ + src/shared/machine-image.h \ + src/shared/copy.c \ + src/shared/copy.h libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -978,6 +982,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 @@ -1332,6 +1354,11 @@ manual_tests += \ test-ipcrm \ test-btrfs +if HAVE_LIBIPTC +manual_tests += \ + test-fw-util +endif + if HAVE_KMOD manual_tests += \ test-rtnl-manual @@ -1352,6 +1379,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-path-lookup \ test-ring \ test-barrier \ test-pty \ @@ -1364,6 +1392,7 @@ tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ + test-fstab-util \ test-prioq \ test-fileio \ test-time \ @@ -1389,7 +1418,8 @@ tests += \ test-execute \ test-copy \ test-cap-list \ - test-sigbus + test-sigbus \ + test-verbs EXTRA_DIST += \ test/a.service \ @@ -1581,6 +1611,7 @@ test_copy_SOURCES = \ src/test/test-copy.c test_copy_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la test_sigbus_SOURCES = \ @@ -1604,6 +1635,12 @@ test_fdset_LDADD = \ libsystemd-shared.la \ libsystemd-internal.la +test_fstab_util_SOURCES = \ + src/test/test-fstab-util.c + +test_fstab_util_LDADD = \ + libsystemd-shared.la + test_ratelimit_SOURCES = \ src/test/test-ratelimit.c @@ -1614,7 +1651,14 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ + libsystemd-shared.la + +test_path_lookup_SOURCES = \ + src/test/test-path-lookup.c + +test_path_lookup_LDADD = \ -lm \ + libsystemd-units.la \ libsystemd-shared.la test_uid_range_SOURCES = \ @@ -1662,6 +1706,12 @@ test_tmpfiles_LDADD = \ test_namespace_SOURCES = \ src/test/test-namespace.c +test_verbs_SOURCES = \ + src/test/test-verbs.c + +test_verbs_LDADD = \ + libsystemd-shared.la + test_namespace_LDADD = \ libsystemd-core.la @@ -1706,8 +1756,7 @@ test_json_SOURCES = \ src/test/test-json.c test_json_LDADD = \ - libsystemd-shared.la \ - -lm + libsystemd-shared.la test_list_SOURCES = \ src/test/test-list.c @@ -1786,8 +1835,23 @@ test_btrfs_SOURCES = \ src/test/test-btrfs.c 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 @@ -2467,6 +2531,9 @@ dbus1-generator-install-hook: dbus1-generator-uninstall-hook: rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator +dist_xinitrc_SCRIPTS = \ + xorg/50-systemd-user.sh + INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook endif @@ -2597,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 @@ -2610,7 +2682,13 @@ systemd_run_LDADD = \ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-proxyd.c \ 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 systemd_bus_proxyd_LDADD = \ libsystemd-internal.la \ @@ -3792,7 +3870,7 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-internal.la -lm \ + libudev-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4339,16 +4417,15 @@ libsystemd_journal_internal_la_SOURCES = \ src/journal/catalog.c \ src/journal/catalog.h \ src/journal/mmap-cache.c \ - src/journal/mmap-cache.h + src/journal/mmap-cache.h \ + src/journal/compress.c # using _CFLAGS = in the conditional below would suppress AM_CFLAGS libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) -libsystemd_journal_internal_la_LIBADD = - -libsystemd_journal_internal_la_SOURCES += \ - src/journal/compress.c +libsystemd_journal_internal_la_LIBADD = \ + libsystemd-label.la if HAVE_XZ libsystemd_journal_internal_la_CFLAGS += \ @@ -4408,6 +4485,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 @@ -4988,8 +5066,7 @@ systemd_timesyncd_LDADD = \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la \ - -lm + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-timesyncd @@ -5053,6 +5130,7 @@ libsystemd_machine_core_la_SOURCES = \ src/machine/machine.h \ src/machine/machined-dbus.c \ src/machine/machine-dbus.c \ + src/machine/machine-dbus.h \ src/machine/image-dbus.c \ src/machine/image-dbus.h @@ -5070,6 +5148,8 @@ machinectl_SOURCES = \ machinectl_LDADD = \ libsystemd-internal.la \ + libsystemd-logs.la \ + libsystemd-journal-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \ @@ -5148,24 +5228,50 @@ 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) \ - -lm + $(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 @@ -5227,7 +5333,6 @@ systemd_resolved_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ - -lm \ $(LIBIDN_LIBS) rootlibexec_PROGRAMS += \ @@ -5295,8 +5400,8 @@ libnss_resolve_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym libnss_resolve_la_LIBADD = \ - libsystemd-shared.la \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-shared.la lib_LTLIBRARIES += \ libnss_resolve.la @@ -5321,7 +5426,6 @@ systemd_resolve_host_SOURCES = \ systemd_resolve_host_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la \ - -lm \ $(LIBIDN_LIBS) rootlibexec_PROGRAMS += \ @@ -5340,6 +5444,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 @@ -5430,6 +5539,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 @@ -5438,6 +5552,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 @@ -5531,6 +5650,8 @@ loginctl_SOURCES = \ loginctl_LDADD = \ libsystemd-internal.la \ + libsystemd-logs.la \ + libsystemd-journal-internal.la \ libudev-internal.la \ libsystemd-shared.la