X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=7f9dc26085fb811082e87d5694be60a5f1fa1248;hb=038cf33420afa5f913fe5cbf3e7138574c33d97b;hp=e024748a66d9f6a9b1d5a6df95c87b5d075cea6c;hpb=8b0cc9a36c8f92f010f2e8465942d2cd7c580d78;p=elogind.git diff --git a/Makefile.am b/Makefile.am index e024748a6..7f9dc2608 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) \ @@ -1352,6 +1356,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-path-lookup \ test-ring \ test-barrier \ test-pty \ @@ -1364,6 +1369,7 @@ tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ + test-fstab-util \ test-prioq \ test-fileio \ test-time \ @@ -1582,6 +1588,7 @@ test_copy_SOURCES = \ src/test/test-copy.c test_copy_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la test_sigbus_SOURCES = \ @@ -1605,6 +1612,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 @@ -1615,7 +1628,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 = \ @@ -1713,8 +1733,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 @@ -1793,6 +1812,7 @@ test_btrfs_SOURCES = \ src/test/test-btrfs.c test_btrfs_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la test_rtnl_manual_SOURCES = \ @@ -2474,6 +2494,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 @@ -3455,6 +3478,7 @@ dist_udevrules_DATA += \ rules/42-usb-hid-pm.rules \ rules/50-udev-default.rules \ rules/60-drm.rules \ + rules/60-evdev_id.rules \ rules/60-keyboard.rules \ rules/70-mouse.rules \ rules/60-persistent-storage-tape.rules \ @@ -3538,6 +3562,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin.c \ src/udev/udev-builtin-btrfs.c \ src/udev/udev-builtin-hwdb.c \ + src/udev/udev-builtin-evdev_id.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-keyboard.c \ src/udev/udev-builtin-net_id.c \ @@ -3799,7 +3824,7 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-internal.la -lm \ + libudev-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4346,16 +4371,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 += \ @@ -4415,6 +4439,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 @@ -4995,8 +5020,7 @@ systemd_timesyncd_LDADD = \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la \ - -lm + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-timesyncd @@ -5173,9 +5197,9 @@ systemd_import_CFLAGS = \ systemd_import_LDADD = \ libsystemd-internal.la \ + libsystemd-label.la \ libsystemd-shared.la \ - $(LIBCURL_LIBS) \ - -lm + $(LIBCURL_LIBS) endif endif @@ -5237,7 +5261,6 @@ systemd_resolved_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ - -lm \ $(LIBIDN_LIBS) rootlibexec_PROGRAMS += \ @@ -5305,8 +5328,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 @@ -5331,7 +5354,6 @@ systemd_resolve_host_SOURCES = \ systemd_resolve_host_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la \ - -lm \ $(LIBIDN_LIBS) rootlibexec_PROGRAMS += \