stuff

7 files changed, 80 insertions, 11 deletions

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index 9d08fd5c23..0d05832fc3 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -44,7 +44,7 @@ _systemd.link_files = $(filter %.o %.lo %.la,$^) $(call _systemd.patsubst-all,$(
 $(outdir)/%.la:
 	@if test $(words $^) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi
 	$(AM_V_CCLD)$(LINK) $(if $(_systemd.rpath),-rpath $(_systemd.rpath)) $(_systemd.link_files)
-$(addprefix $(outdir)/,$(bin_PROGRAMS)): $(outdir)/%:
+$(addprefix $(outdir)/,$(bin_PROGRAMS) $(libexec_PROGRAMS)): $(outdir)/%:
 	@if test $(words $^) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi
 	$(AM_V_CCLD)$(LINK) $(_systemd.link_files)
 
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index 63d54ba07e..61484c2954 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -194,7 +194,7 @@ endef
 at.dirlocal += systemd.sed_files
 
 at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES
-at.dirlocal += bin_PROGRAMS
+at.dirlocal += bin_PROGRAMS libexec_PROGRAMS
 at.dirlocal += pkgconfiglib_DATA
 automake_name = $(subst -,_,$(subst .,_,$1))
 automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
@@ -206,8 +206,9 @@ define automake2autothing
 std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES)
 std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES))
 
-std.out_files += $(bin_PROGRAMS)
+std.out_files += $(bin_PROGRAMS) $(libexec_PROGRAMS)
 std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS))
+std.sys_files += $(addprefix $(libexecdir)/,$(libexec_PROGRAMS))
 
 std.out_files += $(notdir $(pkgconfiglib_DATA))
 std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA)))
@@ -224,7 +225,7 @@ $(foreach t,$(filter %.la,$(std.out_files)),\
 	$(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS)                               )\
 	$(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS)                           )\
 	$(eval AM_LDFLAGS += $($(call automake_name,$t)_LDFLAGS)                             ))
-$(foreach t,$(bin_PROGRAMS),\
+$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS),\
 	$(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_libs,$t))  )\
 	$(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS)                               )\
 	$(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS)                           )\
diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile
new file mode 100644
index 0000000000..2e604d7b86
--- /dev/null
+++ b/src/grp-coredump/Makefile
@@ -0,0 +1,28 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += coredumpctl systemd-coredump
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
index c300710492..ca992c9850 100644
--- a/src/grp-coredump/coredumpctl/Makefile
+++ b/src/grp-coredump/coredumpctl/Makefile
@@ -20,14 +20,14 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 coredumpctl_SOURCES = \
 	src/coredump/coredumpctl.c
 
 coredumpctl_LDADD = \
-	libshared.la
+	$(topoutdir)/src/libshared/libshared.la
 
 bin_PROGRAMS += \
 	coredumpctl
@@ -39,4 +39,7 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_coredumpctl
 
 $(eval $(value automake2autothing))
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += $(libshared.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index 23f2747683..9d7d931a46 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_COREDUMP),)
@@ -30,7 +30,7 @@ systemd_coredump_SOURCES = \
 	src/coredump/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
-	libshared.la
+	$(topoutdir)/src/libshared/libshared.la
 
 ifneq ($(HAVE_ELFUTILS),)
 systemd_coredump_SOURCES += \
@@ -79,4 +79,9 @@ EXTRA_DIST += \
 	units/systemd-coredump@.service.in
 
 $(eval $(value automake2autothing))
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += $(libshared.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
+AM_CPPFLAGS += -I$(topsrcdir)/src/journal
+AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
new file mode 100644
index 0000000000..7412341233
--- /dev/null
+++ b/src/grp-machine/Makefile
@@ -0,0 +1,29 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += machinectl systemd-machined
+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 4becf7900a..ebef7c3f48 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_MACHINED),)
@@ -36,14 +36,17 @@ libnss_mymachines_la_LDFLAGS = \
 	-avoid-version \
 	-shared \
 	-shrext .so.2 \
-	-Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym
+	-Wl,--version-script=$(srcdir)/nss-mymachines.sym
 
 libnss_mymachines_la_LIBADD = \
-	libsystemd-internal.la
+	$(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
 
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
 
 endif # ENABLE_MACHINED
 $(eval $(value automake2autothing))
+at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 include $(topsrcdir)/build-aux/Makefile.tail.mk