more

8 files changed, 51 insertions, 8 deletions

diff --git a/src/Makefile b/src/Makefile
index 6b89d51b66..f8d5583359 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,14 +60,42 @@ at.subdirs += systemd-dbus1-generator
 at.subdirs += systemd-debug-generator
 at.subdirs += systemd-delta
 at.subdirs += systemd-detect-virt
-
-#at.subdirs += systemd-machine-id-setup
-#at.subdirs += systemd-modules-load
-#at.subdirs += systemd-sleep
-#at.subdirs += systemd-socket-proxyd
-#at.subdirs += systemd-sysctl
-
-at.subdirs += systemd-nspawn
+at.subdirs += systemd-escape
+at.subdirs += systemd-firstboot
+at.subdirs += systemd-fsck
+at.subdirs += systemd-fstab-generator
+at.subdirs += systemd-getty-generator
+at.subdirs += systemd-gpt-auto-generator
+at.subdirs += systemd-hibernate-resume
+at.subdirs += systemd-hwdb
 at.subdirs += systemd-initctl
+at.subdirs += systemd-machine-id-setup
+at.subdirs += systemd-modules-load
+at.subdirs += systemd-notify
+at.subdirs += systemd-nspawn
+at.subdirs += systemd-path
+at.subdirs += systemd-quotacheck
+at.subdirs += systemd-random-seed
+at.subdirs += systemd-rc-local-generator
+at.subdirs += systemd-remount-fs
+at.subdirs += systemd-reply-password
+at.subdirs += systemd-rfkill
+at.subdirs += systemd-run
+#at.subdirs += systemd-shutdown
+#at.subdirs += systemd-sleep
+at.subdirs += systemd-socket-proxyd
+at.subdirs += systemd-stdio-bridge
+at.subdirs += systemd-sysctl
+#at.subdirs += systemd-sysusers
+at.subdirs += systemd-system-update-generator
+at.subdirs += systemd-sysv-generator
+#at.subdirs += systemd-timesync
+at.subdirs += systemd-tmpfiles
+at.subdirs += systemd-tty-ask-password-agent
+at.subdirs += systemd-update-done
+at.subdirs += systemd-update-utmp
+at.subdirs += systemd-user-sessions
+at.subdirs += systemd-vconsole
+#at.subdirs += udev
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile
index 02e2bee141..fb93c50d21 100644
--- a/src/systemd-fsck/Makefile
+++ b/src/systemd-fsck/Makefile
@@ -30,4 +30,6 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile
index 47f900aefc..9130fbcfd2 100644
--- a/src/systemd-hwdb/Makefile
+++ b/src/systemd-hwdb/Makefile
@@ -73,4 +73,7 @@ EXTRA_DIST += \
 	hwdb/ids-update.pl \
 	hwdb/sdio.ids
 
+systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb
+systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile
index 42ff1dc814..20400443d7 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -43,4 +43,6 @@ EXTRA_DIST += \
 nodist_systemunit_DATA += \
 	units/quotaon.service
 
+systemd.CPPFLAGS += -DQUOTACHECK=\"$(QUOTACHECK)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile
index d32f124c9a..1cbdeabec4 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -44,4 +44,7 @@ endif # ENABLE_RANDOMSEED
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
+systemd.CPPFLAGS += -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\"
+systemd.CPPFLAGS += -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index cd294f8d93..9ad9586de6 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -32,4 +32,7 @@ systemd_remount_fs_SOURCES = \
 systemd_remount_fs_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\"
+systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-remount-fs/mount-setup.c b/src/systemd-remount-fs/mount-setup.c
new file mode 120000
index 0000000000..a4ab487157
--- /dev/null
+++ b/src/systemd-remount-fs/mount-setup.c
@@ -0,0 +1 @@
+../libcore/mount-setup.c
\ No newline at end of file
diff --git a/src/systemd-remount-fs/mount-setup.h b/src/systemd-remount-fs/mount-setup.h
new file mode 120000
index 0000000000..1f984851f8
--- /dev/null
+++ b/src/systemd-remount-fs/mount-setup.h
@@ -0,0 +1 @@
+../libcore/mount-setup.h
\ No newline at end of file