X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7d5bd5a8035ed5b68aa34f6fc6a9796a26b9d5f7;hp=25d99950ff72e6045fa57960a69828a747795a8b;hb=c93350728e822c3da7522664cf0a0e0ee10509fa;hpb=96cde13ace6406582688028f3df5668a172ba628 diff --git a/Makefile.am b/Makefile.am index 25d99950f..7d5bd5a80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -219,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 @@ -747,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 \ @@ -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 = \ @@ -1181,7 +1184,8 @@ noinst_PROGRAMS += \ test-cgroup \ test-install \ test-watchdog \ - test-log + test-log \ + test-efivars noinst_tests += \ test-job-type \ @@ -1246,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 @@ -1536,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 @@ -3967,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 \