X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=7d5bd5a8035ed5b68aa34f6fc6a9796a26b9d5f7;hb=f4ce2b3e5ce93b83f14f8785e205ebb5a9b8c1df;hp=9c7267b06491db2fb2ce45a3bf8de70e56ef4f4f;hpb=f6b6728d1dc92754026a7f04d26f83e2290778f4;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 9c7267b06..7d5bd5a80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,8 +118,9 @@ dbusinterface_DATA = dist_dbussystemservice_DATA = check_PROGRAMS = check_DATA = -noinst_PROGRAMS = -TESTS = +noinst_tests= +noinst_PROGRAMS = $(noinst_tests) +TESTS = $(noinst_tests) udevlibexec_PROGRAMS = AM_CPPFLAGS = \ @@ -218,7 +219,8 @@ endif systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator + systemd-system-update-generator \ + systemd-efi-boot-generator dist_bin_SCRIPTS = \ src/analyze/systemd-analyze @@ -259,7 +261,6 @@ dist_systemunit_DATA = \ units/network.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ - units/mail-transfer-agent.target \ units/hibernate.target \ units/hybrid-sleep.target \ units/poweroff.target \ @@ -292,7 +293,6 @@ dist_systemunit_DATA = \ units/quotaon.service \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ - units/syslog.target \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target @@ -748,6 +748,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/util.h \ src/shared/virt.c \ src/shared/virt.h \ + src/shared/efivars.c \ + src/shared/efivars.h \ src/shared/path-util.c \ src/shared/path-util.h \ src/shared/time-util.c \ @@ -804,7 +806,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-dst.c \ src/shared/time-dst.h \ src/shared/calendarspec.c \ - src/shared/calendarspec.h + src/shared/calendarspec.h \ + src/shared/output-mode.h libsystemd_shared_la_LIBADD = libsystemd-daemon.la @@ -1097,7 +1100,7 @@ BUILT_SOURCES += \ src/core/syscall-list.txt: Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1109,7 +1112,7 @@ src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ # ------------------------------------------------------------------------------ systemd_SOURCES = \ @@ -1174,27 +1177,17 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ noinst_PROGRAMS += \ test-engine \ - test-job-type \ test-ns \ test-loopback \ test-hostname \ test-daemon \ test-cgroup \ - test-env-replace \ - test-strv \ test-install \ test-watchdog \ - test-unit-name \ test-log \ - test-unit-file \ - test-date \ - test-sleep \ - test-replace-var \ - test-sched-prio \ - test-calendarspec \ - test-strip-tab-ansi + test-efivars -TESTS += \ +noinst_tests += \ test-job-type \ test-env-replace \ test-strv \ @@ -1205,7 +1198,8 @@ TESTS += \ test-replace-var \ test-sched-prio \ test-calendarspec \ - test-strip-tab-ansi + test-strip-tab-ansi \ + test-cgroup-util EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1256,6 +1250,12 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +test_efivars_SOURCES = \ + src/test/test-efivars.c + +test_efivars_LDADD = \ + libsystemd-shared.la + test_unit_name_SOURCES = \ src/test/test-unit-name.c @@ -1322,6 +1322,13 @@ test_cgroup_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +test_cgroup_util_SOURCES = \ + src/test/test-cgroup-util.c + +test_cgroup_util_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + test_env_replace_SOURCES = \ src/test/test-env-replace.c @@ -1539,6 +1546,14 @@ systemd_system_update_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_efi_boot_generator_SOURCES = \ + src/efi-boot-generator/efi-boot-generator.c + +systemd_efi_boot_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c @@ -2439,10 +2454,7 @@ test_id128_LDADD = \ libsystemd-shared.la \ libsystemd-id128-internal.la -noinst_PROGRAMS += \ - test-id128 - -TESTS += \ +noinst_tests += \ test-id128 pkginclude_HEADERS += \ @@ -2732,17 +2744,10 @@ UNINSTALL_DATA_HOOKS += \ catalog-remove-hook noinst_PROGRAMS += \ - test-journal \ - test-journal-send \ - test-journal-syslog \ - test-journal-match \ test-journal-enum \ - test-journal-stream \ - test-journal-verify \ - test-mmap-cache \ test-catalog -TESTS += \ +noinst_tests += \ test-journal \ test-journal-send \ test-journal-syslog \ @@ -2820,7 +2825,9 @@ rootlibexec_PROGRAMS += \ systemd-journal-gatewayd systemd_journal_gatewayd_SOURCES = \ - src/journal/journal-gatewayd.c + src/journal/journal-gatewayd.c \ + src/journal/microhttpd-util.h \ + src/journal/microhttpd-util.c systemd_journal_gatewayd_LDADD = \ libsystemd-shared.la \ @@ -3978,10 +3985,7 @@ systemd-install-data-hook: $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \ $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \ $(DESTDIR)$(systemunitdir)/multi-user.target.wants \ - $(DESTDIR)$(systemunitdir)/graphical.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system \ - $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \ - $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \ $(DESTDIR)$(pkgsysconfdir)/user \