Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/journal/Makefile
#	src/libsystemd/Makefile
#	src/libsystemd/libsystemd-internal/Makefile
#	src/libsystemd/libsystemd-journal-internal/Makefile

5 files changed, 13 insertions, 13 deletions

diff --git a/src/boot/efi/Makefile b/src/boot/efi/Makefile
index 220a4d2175..9b86554977 100644
--- a/src/boot/efi/Makefile
+++ b/src/boot/efi/Makefile
@@ -48,7 +48,7 @@ ifneq ($(ENABLE_EFI),)
 ifneq ($(HAVE_GNUEFI),)
 bootlib_DATA = $(systemd_boot)
 
-$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
+$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
 	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
 	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
 
@@ -96,7 +96,7 @@ ifneq ($(ENABLE_EFI),)
 ifneq ($(HAVE_GNUEFI),)
 bootlib_DATA += $(stub)
 
-$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
+$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
 	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
 	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
 
diff --git a/src/journal/Makefile b/src/journal/Makefile
index 1334a155d3..de004d78e9 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -28,24 +28,24 @@ ifneq ($(HAVE_AUDIT),)
 audit_list_includes += -include libaudit.h
 endif
 
-src/journal/audit_type-list.txt:
+$(outdir)/audit_type-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
 
-src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
+$(outdir)/audit_type-to-name.h: src/journal/audit_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
 
 
-src/resolve/dns_type-list.txt: src/resolve/dns-type.h
+$(outdir)/dns_type-list.txt: src/resolve/dns-type.h
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
 
-src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt
+$(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
 
-src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
+$(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
 
@@ -262,6 +262,7 @@ tests += \
 	test-compress-benchmark
 endif
 
+
 rootlibexec_PROGRAMS += \
 	systemd-journald
 
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 935c0c968c..5eef67be3d 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -165,7 +165,7 @@ libcore_la_LIBADD = \
 	$(APPARMOR_LIBS) \
 	$(MOUNT_LIBS)
 
-src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
+$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(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 ";" }' < $< > $@
 
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index 306d6db7f3..4e1f7327ae 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -94,5 +94,4 @@ endif
 
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/Makefile b/src/udev/Makefile
index 8058082c05..22fe5075cf 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -83,14 +83,14 @@ rootlibexec_PROGRAMS += \
 noinst_LTLIBRARIES += \
 	libudev-core.la
 
-src/udev/keyboard-keys-list.txt:
+$(outdir)/keyboard-keys-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
-src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
+$(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
 
-src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
+$(outdir)/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
 gperf_txt_sources += \
@@ -269,7 +269,7 @@ check_DATA += \
 endif
 
 # packed sysfs test tree
-test/sys:
+$(outdir)/sys:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz