fixity

11 files changed, 22 insertions, 15 deletions

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index 0369b59bcf..a84e4b6ebc 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -28,6 +28,7 @@ std.clean_files += *-list.txt
 std.clean_files += *-from-name.gperf
 std.clean_files += *-from-name.h
 std.clean_files += *-to-name.h
+std.clean_files += *-gperf.c
 
 $(outdir)/%.o : $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(COMPILE)   -c -o $@ $<
 $(outdir)/%.o : $(outdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(COMPILE)   -c -o $@ $<
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index 9939919f5e..75c35b6f4d 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -25,7 +25,9 @@ SHELL = bash -o pipefail
 
 OUR_CPPFLAGS += -MT $@ -MD -MP -MF $(@D)/$(DEPDIR)/$(basename $(@F)).P$(patsubst .%,%,$(suffix $(@F)))
 OUR_CPPFLAGS += -include $(topoutdir)/config.h
-OUR_CPPFLAGS += $(if $(<D),-I$(<D)) -I$(@D)
+OUR_CPPFLAGS += $(sort $(if $(<D),-I$(<D)) \
+                       $(if $(filter $(abspath $(topoutdir))/%,$(abspath $<)),-I$(call at.path,$(dir $(patsubst $(abspath $(topoutdir))/%,$(abspath $(topsrcdir))/%,$(abspath $<))))) \
+                       -I$(@D) )
 
 at.dirlocal += systemd.CFLAGS systemd.CPPFLAGS systemd.LDFLAGS systemd.LIBTOOLFLAGS
 ALL_CFLAGS       = $(OUR_CFLAGS)       $(am.CFLAGS/$(@D))       $(systemd.CFLAGS/$(@D))       $(CFLAGS)
@@ -37,11 +39,6 @@ COMPILE   = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=compile $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
 LINK      = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=link $(CCLD) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@
 
-SED_PROCESS = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
-		< $< > $@
-
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
diff --git a/build-aux/Makefile.tail.mk b/build-aux/Makefile.tail.mk
index be3a8c2de0..38f40c2e6a 100644
--- a/build-aux/Makefile.tail.mk
+++ b/build-aux/Makefile.tail.mk
@@ -17,13 +17,14 @@
 
 include $(call _at.reverse,$(sort $(wildcard $(topsrcdir)/build-aux/Makefile.each.tail/*.mk)))
 
-at.subdirs := $(call at.addprefix,$(outdir)/,$(at.subdirs))
-at.depdirs := $(call at.addprefix,$(outdir)/,$(at.depdirs))
-
 # Move all of the dirlocal variables to their namespaced version
 $(foreach v,$(at.dirlocal),$(eval $v/$(outdir) := $$($v)))
 $(foreach v,$(at.dirlocal),$(eval undefine $v))
 
+# Adjust subdirs and depdirs to be relative to $(outdir)
+at.subdirs/$(outdir) := $(sort $(patsubst %/,%,$(call at.addprefix,$(outdir)/,$(at.subdirs/$(outdir)))))
+at.depdirs/$(outdir) := $(sort $(patsubst %/,%,$(call at.addprefix,$(outdir)/,$(at.depdirs/$(outdir)))))
+
 # Remember that this is a directory that we've visited
 _at.outdirs := $(_at.outdirs) $(outdir)
 
diff --git a/config.mk.in b/config.mk.in
index 5d11bdcbba..3d71265213 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -236,6 +236,9 @@ ARCH_AARCH64 = @ARCH_AARCH64_TRUE@1
 ARCH_IA32 = @ARCH_IA32_TRUE@1
 ARCH_X86_64 = @ARCH_X86_64_TRUE@1
 
+DEFAULT_DNSSEC_MODE = @DEFAULT_DNSSEC_MODE@
+KILL_USER_PROCESSES = @KILL_USER_PROCESSES@
+
 ENABLE_BACKLIGHT = @ENABLE_BACKLIGHT_TRUE@1
 ENABLE_BASH_COMPLETION = @ENABLE_BASH_COMPLETION_TRUE@1
 ENABLE_BINFMT = @ENABLE_BINFMT_TRUE@1
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
index e44caea1ec..221257b905 100644
--- a/src/grp-boot/bootctl/Makefile
+++ b/src/grp-boot/bootctl/Makefile
@@ -52,6 +52,7 @@ dist_zshcompletion_data += \
 endif # HAVE_BLKID
 endif # ENABLE_EFI
 
+bootctl_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index 7412341233..59142f78bd 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -24,6 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 at.subdirs += machinectl systemd-machined
+at.subdirs += libmachine-core
 at.subdirs += nss-mymachines
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index 5042e170e2..454ab3f90e 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -43,6 +43,7 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
 
+libnss_mymachines_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index b3d0698ffe..9846a197c4 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -148,6 +148,7 @@ test_local_addresses_SOURCES = \
 test_local_addresses_LDADD = \
 	libshared.la
 
+libshared_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 1637753248..be314d91c4 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-libsystemd_internal_la_SOURCES = \
+_libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
@@ -115,7 +115,7 @@ libsystemd_internal_la_LIBADD = \
 	libbasic.la \
 	-lresolv
 
-_noinst_LTLIBRARIES += \
+noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
 test_bus_marshal_SOURCES = \
@@ -242,9 +242,8 @@ test_resolve_SOURCES = \
 test_resolve_LDADD = \
 	libshared.la
 
-at.out_files += libsystemd-internal.la
-libsystemd-internal.la_SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(libsystemd_internal_la_SOURCES)))
-$(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(libsystemd-internal.la_SOURCES:.c=.o))
-at.subdirs += $(sort $(patsubst %/,%,$(dir $(libsystemd-internal.la_SOURCES))))
+libsystemd-internal.la.SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES)))
+libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo))
+at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES)))
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/machine-id-setup.c b/src/systemd-nspawn/machine-id-setup.c
new file mode 120000
index 0000000000..2f0f2d8cf1
--- /dev/null
+++ b/src/systemd-nspawn/machine-id-setup.c
@@ -0,0 +1 @@
+../libcore/machine-id-setup.c
\ No newline at end of file
diff --git a/src/systemd-nspawn/machine-id-setup.h b/src/systemd-nspawn/machine-id-setup.h
new file mode 120000
index 0000000000..6b34cb74f4
--- /dev/null
+++ b/src/systemd-nspawn/machine-id-setup.h
@@ -0,0 +1 @@
+../libcore/machine-id-setup.h
\ No newline at end of file