8 files changed, 28 insertions, 12 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index 14c5a9d93e..4f82baed90 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -72,6 +72,8 @@ $(addprefix $(outdir)/,$(systemd.sed_files)): $(outdir)/%: $(srcdir)/%.in
 
 $(outdir)/%.c: $(srcdir)/%.gperf
 	$(AM_V_GPERF)$(GPERF) < $< > $@
+$(outdir)/%.c: $(outdir)/%.gperf
+	$(AM_V_GPERF)$(GPERF) < $< > $@
 
 $(outdir)/%: $(srcdir)/%.m4 $(top_builddir)/config.status
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index a73fc831cf..87a8e3bf0b 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -82,6 +82,16 @@ AM_V_CCLD_ = $(AM_V_CCLD_$(AM_DEFAULT_VERBOSITY))
 AM_V_CCLD_0 = @echo "  CCLD    " $@;
 AM_V_CCLD_1 =
 
+AM_V_EFI_CC = $(AM_V_EFI_CC_$(V))
+AM_V_EFI_CC_ = $(AM_V_EFI_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_EFI_CC_0 = @echo "  EFI_CC  " $@;
+AM_V_EFI_CC_1 =
+
+AM_V_EFI_CCLD = $(AM_V_EFI_CCLD_$(V))
+AM_V_EFI_CCLD_ = $(AM_V_EFI_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_EFI_CCLD_0 = @echo "  EFI_CCLD" $@;
+AM_V_EFI_CCLD_1 =
+
 AM_V_P = $(AM_V_P_$(V))
 AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY))
 AM_V_P_0 = false
diff --git a/config.mk.in b/config.mk.in
index 310f4c07f8..b28fa1f2a8 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -102,8 +102,8 @@ libexecdir=$(prefix)/lib/systemd
 # Libraries we depend on
 libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic
 libbasic.DEPENDS                     =   $(topoutdir)/src/libbasic/libbasic.la
-#libcore.CPPFLAGS                     =
-#libcore.DEPENDS                      =
+libcore.CPPFLAGS                     = -I$(topsrcdir)/src/libcore
+libcore.DEPENDS                      =   $(topoutdir)/src/libcore/libcore.la
 libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall
 libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
 libshared.CPPFLAGS                   = $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared
diff --git a/src/Makefile b/src/Makefile
index 5aa9e0fda5..b3de845981 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,10 +37,9 @@ at.subdirs += grp-coredump
 at.subdirs += grp-resolve
 #at.subdirs += grp-system
 at.subdirs += grp-timedate
-at.subdirs += initctl
 at.subdirs += kernel-install
 at.subdirs += libbasic
-#at.subdirs += libcore
+at.subdirs += libcore
 at.subdirs += libfirewall
 at.subdirs += libshared
 at.subdirs += libsystemd
@@ -48,8 +47,8 @@ at.subdirs += libsystemd-network
 at.subdirs += libudev
 at.subdirs += nss-myhostname
 at.subdirs += systemd-activate
-at.subdirs += systemd-ac-power
-at.subdirs += systemd-analyze
+#at.subdirs += systemd-ac-power
+#at.subdirs += systemd-analyze
 
 #at.subdirs += systemd-machine-id-setup
 #at.subdirs += systemd-modules-load
@@ -58,5 +57,6 @@ at.subdirs += systemd-analyze
 #at.subdirs += systemd-sysctl
 
 at.subdirs += systemd-nspawn
+at.subdirs += systemd-initctl
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile
index f2a0ed47cb..2a56560c2c 100644
--- a/src/grp-boot/systemd-boot/Makefile
+++ b/src/grp-boot/systemd-boot/Makefile
@@ -84,11 +84,11 @@ EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
 endif # ARCH_AARCH64
 
 $(outdir)/%.o: $(srcdir)/%.c
-	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
+	$(AM_V_EFI_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
 
 $(outdir)/%.so:
 	@if test $(words $^) = 0; then echo 'Cannot link EFI library with no dependencies: $@' >&2; exit 1; fi
-	$(AM_V_CCLD)$(LD) $(efi_ldflags) $^ -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+	$(AM_V_EFI_CCLD)$(LD) $(efi_ldflags) $^ -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
 	$(AM_V_at)! { nm -D -u $@ | grep ' U '; }
 
 # These next 2 are the same rule
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index f40a115042..53059eda20 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -163,8 +163,14 @@ libcore_la_LIBADD = \
 	$(APPARMOR_LIBS) \
 	$(MOUNT_LIBS)
 
-$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
+$(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
+systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
+systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
+systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
+systemd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\"
+systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-initctl/Makefile b/src/systemd-initctl/Makefile
index 66f3e72aa5..726a1404d3 100644
--- a/src/systemd-initctl/Makefile
+++ b/src/systemd-initctl/Makefile
@@ -30,7 +30,6 @@ systemd_initctl_SOURCES = \
 systemd_initctl_LDADD = \
 	libshared.la
 
-libexec_PROGRAMS += systemd-initctl
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 460a491a3a..5d6fcfdc5a 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -82,7 +82,6 @@ test_patch_uid_LDADD = \
 manual_tests += \
 	test-patch-uid
 
-bin_PROGRAMS += systemd-nspawn
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src