stuff

7 files changed, 75 insertions, 44 deletions

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index 0d05832fc3..0369b59bcf 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -29,11 +29,10 @@ std.clean_files += *-from-name.gperf
 std.clean_files += *-from-name.h
 std.clean_files += *-to-name.h
 
-$(outdir)/%.o: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps
-	$(AM_V_CC)$(COMPILE)   -c -o $@ $<
-
-$(outdir)/%.lo: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps
-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+$(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 $@ $<
+$(outdir)/%.lo: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+$(outdir)/%.lo: $(outdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
 
 $(outdir)/.deps:
 	$(AM_V_at)$(MKDIR_P) $@
diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk
index 77320da714..438dd817ef 100644
--- a/build-aux/Makefile.each.tail/30-automake2autothing.mk
+++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk
@@ -14,14 +14,15 @@ $(foreach n,$(call automake_name,$(std.out_files)),\
   $(eval $n_CFLAGS ?=)\
   $(eval $n_CPPFLAGS ?=)\
   $(eval $n_LDFLAGS ?=)\
-  $(eval $n_LIBADD ?=))
-$(foreach t,$(filter %.la,$(std.out_files)),\
-	$(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_libs,$t)) )\
-	$(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) $(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)                           )\
-	$(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS)                             ))
+  $(eval $n_LIBADD ?=)\
+  $(eval $n_LDADD ?=))
+$(foreach t,$(filter %.la,$(std.out_files)),                                                        \
+	$(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_lib,$t,LIBADD)) )\
+	$(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LIBADD)  )\
+	$(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS)                                     )\
+	$(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS)                                   ))
+$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS),                                                    \
+	$(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t)  $(call automake_lib,$t,LDADD))  )\
+	$(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LDADD)   )\
+	$(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS)                                     )\
+	$(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS)                                   ))
diff --git a/build-aux/Makefile.once.head/30-automake2autothing.mk b/build-aux/Makefile.once.head/30-automake2autothing.mk
index a1df4e2518..9b05224d1c 100644
--- a/build-aux/Makefile.once.head/30-automake2autothing.mk
+++ b/build-aux/Makefile.once.head/30-automake2autothing.mk
@@ -6,4 +6,5 @@ automake_name = $(subst -,_,$(subst .,_,$1))
 automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
 automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources)))
 automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources)))
-automake_libs = $($(automake_name)_LIBADD) $($(automake_name)_LDADD)
+automake_lib = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).DEPENDS)  , $l ))
+automake_cpp = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).CPPFLAGS) ,    ))
diff --git a/config.mk.in b/config.mk.in
index 498745c9d0..5d11bdcbba 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -97,18 +97,53 @@ bindir=$(prefix)/bin
 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
-libshared.CPPFLAGS     = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared
-libshared.DEPENDS      =   $(topoutdir)/src/libshared/libshared.la
-libfirewall.CPPFLAGS   = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall
-libfirewall.DEPENDS    =   $(topoutdir)/src/libfirewall/libfirewall.la
-libsystemd.CPPFLAGS    = -I$(topsrcdir)/src/libsystemd/include
-libsystemd.DEPENDS     =   $(topoutdir)/src/libsystemd/libsystemd/libsystemd.la
-libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/libsystemd-internal/include
-libsystemd-internal.DEPENDS  =   $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
-libsystemd-journal.CPPFLAGS  = -I$(topsrcdir)/src/libsystemd/libsystemd-journal/include
-libsystemd-journal.DEPENDS   =   $(topoutdir)/src/libsystemd/libsystemd-journal/libsystemd-journal.la
+libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic
+libbasic.DEPENDS                     =   $(topoutdir)/src/libbasic/libbasic.la
+#libcore.CPPFLAGS                     =
+#libcore.DEPENDS                      =
+libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall
+libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
+libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared
+libshared.DEPENDS                    =   $(topoutdir)/src/libshared/libshared.la
+#libsystemd-internal.CPPFLAGS         =
+libsystemd-internal.DEPENDS          =   $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
+#libsystemd-journal-internal.CPPFLAGS =
+libsystemd-journal-internal.DEPENDS  =   $(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la
+#libsystemd-network.CPPFLAGS          =
+#libsystemd-network.DEPENDS           =
+libsystemd.CPPFLAGS                  = -I$(topsrcdir)/src/libsystemd/include
+libsystemd.DEPENDS                   =   $(topoutdir)/src/libsystemd/libsystemd.la
+libudev.CPPFLAGS                     = -I$(topsrcdir)/src/libudev/include
+libudev.DEPENDS                      =   $(topoutdir)/src/libudev/src/libudev.la
+# # -core libs
+# libbus-proxy-core.CPPFLAGS =
+# libbus-proxy-core.DEPENDS  =
+# libjournal-core.CPPFLAGS   =
+# libjournal-core.DEPENDS    =
+# liblogind-core.CPPFLAGS    =
+# liblogind-core.DEPENDS     =
+# libmachine-core.CPPFLAGS   =
+# libmachine-core.DEPENDS    =
+# libnetworkd-core.CPPFLAGS  =
+# libnetworkd-core.DEPENDS   =
+# libudev-core.CPPFLAGS      =
+# libudev-core.DEPENDS       =
+# # compat-libs
+# libsystemd-daemon.CPPFLAGS  =
+# libsystemd-daemon.DEPENDS   =
+# libsystemd-id128.CPPFLAGS   =
+# libsystemd-id128.DEPENDS    =
+# libsystemd-journal.CPPFLAGS =
+# libsystemd-journal.DEPENDS  =
+# libsystemd-login.CPPFLAGS   =
+# libsystemd-login.DEPENDS    =
+# # NSS modules
+# libnss_myhostname.CPPFLAGS =
+# libnss_myhostname.DEPENDS  =
+# libnss_mymachines.CPPFLAGS =
+# libnss_mymachines.DEPENDS  =
+# libnss_resolve.CPPFLAGS    =
+# libnss_resolve.DEPENDS     =
 
 HAVE_ACL        = @HAVE_ACL_TRUE@1
      ACL_CFLAGS = #XXX
@@ -243,7 +278,7 @@ HAVE_SMACK = @HAVE_SMACK_TRUE@1
 HAVE_SYSV_COMPAT = @HAVE_SYSV_COMPAT_TRUE@1
 HAVE_UTMP = @HAVE_UTMP_TRUE@1
 
-LIBTOOLFLAGS = 
+LIBTOOLFLAGS =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -306,26 +341,26 @@ OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PATH_SEPARATOR = :
-PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_LIBDIR =
 PKG_CONFIG_PATH = /home/luke/.prefix/lib/pkgconfig
 PYTHON_EXEC_PREFIX = ${exec_prefix}
 PYTHON_PLATFORM = linux
 PYTHON_PREFIX = ${prefix}
 PYTHON_VERSION = 3.5
-QEMU_BIOS = 
+QEMU_BIOS =
 RC_LOCAL_SCRIPT_PATH_START = /etc/rc.local
 RC_LOCAL_SCRIPT_PATH_STOP = /usr/sbin/halt.local
-SET_MAKE = 
+SET_MAKE =
 SYSTEM_GID_MAX = 999
-SYSTEM_SYSVINIT_PATH = 
-SYSTEM_SYSVRCND_PATH = 
+SYSTEM_SYSVINIT_PATH =
+SYSTEM_SYSVRCND_PATH =
 SYSTEM_UID_MAX = 999
 TELINIT = /lib/sysvinit/telinit
 TTY_GID = 5
 USE_NLS = yes
 
 build = x86_64-unknown-linux-gnu
-build_alias = 
+build_alias =
 build_cpu = x86_64
 build_os = linux-gnu
 build_vendor = unknown
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 7728d0f911..51bcd0fc69 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -127,8 +127,6 @@ test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
 $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
-$(outdir)/libsystemd.la: $(outdir)/libsystemd-internal/libsystemd-internal.la
-$(outdir)/libsystemd.la: $(outdir)/libsystemd-journal-internal/libsystemd-journal-internal.la
 at.subdirs += libsystemd-internal libsystemd-journal-internal
 systemd.sed_files += libsystemd.pc
 #at.subdirs += compat-libs
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 9966b90aa1..41bb847bab 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -75,9 +75,9 @@ test_libudev_sym_LDADD = \
 	libudev.la
 
 systemd.sed_files += libudev.pc
+
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
-systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb
 
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index db287fb926..380266ea7f 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -67,11 +67,8 @@ systemd_nspawn_LDADD += \
 endif # HAVE_LIBIPTC
 
 bin_PROGRAMS += systemd-nspawn
-at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS))
-
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+systemd_nspawn_LDADD += libsystemd.la # was hidden by libshared->libsystemd
+systemd_nspawn_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src