stuff

2 files changed, 176 insertions, 53 deletions

diff --git a/Makefile.am b/Makefile.am
index 3846a21ef9..e4d42900fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,12 +40,12 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-#@src/libudev/Makefile
+#@src/libudev/src/Makefile
 LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-#@src/libsystemd/Makefile
+#@src/libsystemd/src/Makefile
 LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
 LIBSYSTEMD_AGE=14
@@ -68,7 +68,7 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-#@config.mk
+#@config.mk.in
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -358,28 +358,63 @@ INSTALL_EXEC_HOOKS += \
 INSTALL_EXEC_HOOKS += \
 	install-busnames-target-wants-hook
 
-# ------------------------------------------------------------------------------
+#@am-pretty.mk -----------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
 AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
 AM_V_M4_0 = @echo "  M4      " $@;
+AM_V_M4_1 = 
 
 AM_V_XSLT = $(AM_V_XSLT_$(V))
 AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
 AM_V_XSLT_0 = @echo "  XSLT    " $@;
+AM_V_XSLT_1 = 
 
 AM_V_GPERF = $(AM_V_GPERF_$(V))
 AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
 AM_V_GPERF_0 = @echo "  GPERF   " $@;
+AM_V_GPERF_1 = 
 
 AM_V_LN = $(AM_V_LN_$(V))
 AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
 AM_V_LN_0 = @echo "  LN      " $@;
+AM_V_LN_1 = 
 
 AM_V_RM = $(AM_V_RM_$(V))
 AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
 AM_V_RM_0 = @echo "  RM      " $@;
+AM_V_RM_1 = 
+
+AM_V_CC = $(AM_V_CC_$(V))
+AM_V_CC_ = $(AM_V_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC_0 = @echo "  CC      " $@;
+AM_V_CC_1 = 
+
+AM_V_CCLD = $(AM_V_CCLD_$(V))
+AM_V_CCLD_ = $(AM_V_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD_0 = @echo "  CCLD    " $@;
+AM_V_CCLD_1 = 
+
+AM_V_P = $(AM_V_P_$(V))
+AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY))
+AM_V_P_0 = false
+AM_V_P_1 = :
+
+AM_V_GEN = $(AM_V_GEN_$(V))
+AM_V_GEN_ = $(AM_V_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN_0 = @echo "  GEN     " $@;
+AM_V_GEN_1 = 
+
+AM_V_at = $(AM_V_at_$(V))
+AM_V_at_ = $(AM_V_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at_0 = @
+AM_V_at_1 = 
+
+AM_V_lt = $(AM_V_lt_$(V))
+AM_V_lt_ = $(AM_V_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt_0 = --silent
+AM_V_lt_1 = 
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 rootbin_PROGRAMS = \
 	systemctl \
 	systemd-notify \
@@ -761,7 +796,7 @@ EXTRA_DIST += \
 	tools/xml_helper.py \
 	man/glib-event-glue.c
 
-#@src/basic/Makefile -----------------------------------------------------------
+#@src/libbasic/Makefile --------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libbasic.la
 
@@ -980,7 +1015,7 @@ libbasic_la_LIBADD = \
 	-lrt \
 	-lm
 
-#@src/shared/Makefile ---------------------------------------------------------
+#@src/libshared/Makefile -------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libshared.la
 
@@ -1095,7 +1130,7 @@ libshared_la_LIBADD = \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
-# -----------------------------------------------------------------------------
+#@src/libfirewall/Makefile -----------------------------------------------------
 if HAVE_LIBIPTC
 noinst_LTLIBRARIES += \
 	libfirewall.la
@@ -1112,7 +1147,7 @@ libfirewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
 endif
 
-#@discard.mk ------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 if ENABLE_LDCONFIG
 dist_systemunit_DATA += \
 	units/ldconfig.service
@@ -1121,7 +1156,7 @@ SYSINIT_TARGET_WANTS += \
 	ldconfig.service
 endif
 
-#@src/core/Makefile ------------------------------------------------------------
+#@src/libcore/Makefile ---------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libcore.la
 
@@ -1297,6 +1332,7 @@ EXTRA_DIST += \
 CLEANFILES += \
 	$(gperf_txt_sources)
 
+#@common.once.head.mk
 %-from-name.gperf: %-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
@@ -1305,7 +1341,7 @@ CLEANFILES += \
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
-#@src/basic/Makefile
+#@src/libbasic/Makefile
 src/basic/errno-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
@@ -1380,7 +1416,7 @@ src/resolve/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 }' <$< >$@
 
-#@src/core/Makefile ------------------------------------------------------------
+#@src/system/systemd/Makefile --------------------------------------------------
 systemd_SOURCES = \
 	src/core/main.c
 
@@ -2279,7 +2315,7 @@ lcov-run lcov-report:
 	echo "Need to reconfigure with --enable-coverage"
 endif
 
-#@src/analyze/Makefile ---------------------------------------------------------
+#@src/systemd-analyze/Makefile -------------------------------------------------
 systemd_analyze_SOURCES = \
 	src/analyze/analyze.c \
 	src/analyze/analyze-verify.c \
@@ -2300,7 +2336,7 @@ systemd_initctl_SOURCES = \
 systemd_initctl_LDADD = \
 	libshared.la
 
-#@src/update-utmp/Makefile -----------------------------------------------------
+#@src/systemd-update-utmp/Makefile ---------------------------------------------
 systemd_update_utmp_SOURCES = \
 	src/update-utmp/update-utmp.c
 
@@ -2312,14 +2348,14 @@ systemd_update_utmp_LDADD = \
 	libshared.la \
 	$(AUDIT_LIBS)
 
-#@src/update-done/Makefile -----------------------------------------------------
+#@src/systemd-update-done/Makefile ---------------------------------------------
 systemd_update_done_SOURCES = \
 	src/update-done/update-done.c
 
 systemd_update_done_LDADD = \
 	libshared.la
 
-#@src/core/Makefile ------------------------------------------------------------
+#@src/libcore/Makefile ---------------------------------------------------------
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
@@ -2367,7 +2403,7 @@ EXTRA_DIST += \
 	units/systemd-modules-load.service.in \
 	units/kmod-static-nodes.service.in
 
-#@src/tmpfiles/Makefile --------------------------------------------------------
+#@src/systemd-tmpfiles/Makefile ------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
 	src/tmpfiles/tmpfiles.c
@@ -2544,7 +2580,7 @@ systemd_detect_virt_LDADD = \
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
 
-#@src/delta/Makefile -----------------------------------------------------------
+#@src/systemd-delta/Makefile ---------------------------------------------------
 systemd_delta_SOURCES = \
 	src/delta/delta.c
 
@@ -2864,7 +2900,7 @@ systemd_rc_local_generator_SOURCES = \
 systemd_rc_local_generator_LDADD = \
 	libshared.la
 
-#@src/remount-fs/Makefile ------------------------------------------------------
+#@src/systemd-remount-fs/Makefile ----------------------------------------------
 systemd_remount_fs_SOURCES = \
 	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
@@ -2873,70 +2909,70 @@ systemd_remount_fs_SOURCES = \
 systemd_remount_fs_LDADD = \
 	libshared.la
 
-#@src/cgroups-agent/Makefile ---------------------------------------------------
+#@src/systemd-cgroups-agent/Makefile -------------------------------------------
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent/cgroups-agent.c
 
 systemd_cgroups_agent_LDADD = \
 	libshared.la
 
-#@src/escape/Makefile ----------------------------------------------------------
+#@src/systemd-escape/Makefile --------------------------------------------------
 systemd_escape_SOURCES = \
 	src/escape/escape.c
 
 systemd_escape_LDADD = \
 	libshared.la
 
-#@src/systemctl/Makefile ------------------------------------------------------
+#@src/system/systemctl/Makefile ------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
 systemctl_LDADD = \
 	libshared.la
 
-#@src/notify/Makefile ----------------------------------------------------------
+#@src/systemd-notify/Makefile --------------------------------------------------
 systemd_notify_SOURCES = \
 	src/notify/notify.c
 
 systemd_notify_LDADD = \
 	libshared.la
 
-#@src/path/Makefile ------------------------------------------------------------
+#@src/systemd-path/Makefile ----------------------------------------------------
 systemd_path_SOURCES = \
 	src/path/path.c
 
 systemd_path_LDADD = \
 	libshared.la
 
-#@src/ask-password/Makefile ----------------------------------------------------
+#@src/systemd-ask-password/Makefile --------------------------------------------
 systemd_ask_password_SOURCES = \
 	src/ask-password/ask-password.c
 
 systemd_ask_password_LDADD = \
 	libshared.la
 
-#@src/reply-password/Makefile --------------------------------------------------
+#@src/systemd-reply-password/Makefile ------------------------------------------
 systemd_reply_password_SOURCES = \
 	src/reply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libshared.la
 
-#@src/cgls/Makefile ------------------------------------------------------------
+#@src/systemd-cgls/Makefile ----------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
 	libshared.la
 
-#@src/cgtop/Makefile -----------------------------------------------------------
+#@src/systemd-cgtop/Makefile ---------------------------------------------------
 systemd_cgtop_SOURCES = \
 	src/cgtop/cgtop.c
 
 systemd_cgtop_LDADD = \
 	libshared.la
 
-#@src/nspawn/Makefile ----------------------------------------------------------
+#@src/systemd-nspawn/Makefile --------------------------------------------------
 systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn.c \
 	src/nspawn/nspawn-settings.c \
@@ -2980,7 +3016,7 @@ systemd_nspawn_LDADD += \
 	libfirewall.la
 endif
 
-#@src/run/Makefile -------------------------------------------------------------
+#@src/systemd-run/Makefile -----------------------------------------------------
 systemd_run_SOURCES = \
 	src/run/run.c
 
@@ -3041,14 +3077,14 @@ bus-proxyd-set-cap-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
 endif
 
-#@src/tty-ask-password-agent/Makefile ------------------------------------------
+#@src/systemd-tty-ask-password-agent/Makefile ----------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
 
 systemd_tty_ask_password_agent_LDADD = \
 	libshared.la
 
-#@src/libsystemd/Makefile ------------------------------------------------------
+#@src/libsystemd/src/Makefile --------------------------------------------------
 libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
@@ -3519,7 +3555,7 @@ tests += \
 	test-dhcp6-client \
 	test-lldp
 
-#@src/libudev/Makefile ---------------------------------------------------------
+#@src/libudev/src/Makefile -----------------------------------------------------
 include_HEADERS += \
 	src/libudev/libudev.h
 
@@ -3917,7 +3953,7 @@ test_id128_LDADD = \
 tests += \
 	test-id128
 
-#@src/activate/Makefile --------------------------------------------------------
+#@src/systemd-activate/Makefile ------------------------------------------------
 
 rootlibexec_PROGRAMS += \
 	systemd-activate
@@ -4477,7 +4513,7 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
 	units/systemd-coredump@.service.in
 
-#@src/binfmt/Makefile ----------------------------------------------------------
+#@src/systemd-binfmt/Makefile --------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
 	src/binfmt/binfmt.c
@@ -4508,7 +4544,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
 
-#@src/vconsole/Makefile --------------------------------------------------------
+#@src/systemd-vconsole/Makefile ------------------------------------------------
 if ENABLE_VCONSOLE
 systemd_vconsole_setup_SOURCES = \
 	src/vconsole/vconsole-setup.c
@@ -4533,7 +4569,7 @@ EXTRA_DIST += \
 	src/vconsole/90-vconsole.rules.in \
 	units/systemd-vconsole-setup.service.in
 
-#@src/bootchart/Makefile -------------------------------------------------------
+#@src/systemd-bootchart/Makefile -----------------------------------------------
 if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \
 	src/bootchart/bootchart.c \
@@ -4559,7 +4595,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
 
-#@src/quotacheck/Makefile ------------------------------------------------------
+#@src/systemd-quotacheck/Makefile ----------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
 	systemd-quotacheck
@@ -4580,7 +4616,7 @@ EXTRA_DIST += \
 nodist_systemunit_DATA += \
 	units/quotaon.service
 
-#@src/random-seed/Makefile -----------------------------------------------------
+#@src/systemd-random-seed/Makefile ---------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
 	systemd-random-seed
@@ -4602,7 +4638,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
-#@src/backlight/Makefile -------------------------------------------------------
+#@src/systemd-backlight/Makefile -----------------------------------------------
 if ENABLE_BACKLIGHT
 rootlibexec_PROGRAMS += \
 	systemd-backlight
@@ -4620,7 +4656,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-backlight@.service.in
 
-#@src/rfkill/Makefile ----------------------------------------------------------
+#@src/systemd-rfkill/Makefile --------------------------------------------------
 if ENABLE_RFKILL
 rootlibexec_PROGRAMS += \
 	systemd-rfkill
@@ -4641,7 +4677,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-rfkill.service.in
 
-#@src/cryptsetup/Makefile ------------------------------------------------------
+#@src/systemd-cryptsetup/Makefile ----------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
@@ -4729,7 +4765,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
-#@src/core/Makefile.mk ---------------------------------------------------------
+#@src/system/systemd/Makefile --------------------------------------------------
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.systemd1.busname
 
@@ -4801,7 +4837,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
-#@src/timedate/Makefile --------------------------------------------------------
+#@src/systemd-timedate/Makefile ------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
@@ -4855,7 +4891,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
-#@src/timesync/Makefile --------------------------------------------------------
+#@src/systemd-timesync/Makefile ------------------------------------------------
 if ENABLE_TIMESYNCD
 systemd_timesyncd_SOURCES = \
 	src/timesync/timesyncd.c \
@@ -4916,7 +4952,7 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
-#@src/machine/Makefile ---------------------------------------------------------
+#@src/machine/src/Makefile -----------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
@@ -5185,7 +5221,7 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
-#@src/resolve/Makefile ---------------------------------------------------------
+#@src/resolve/src/Makefile -----------------------------------------------------
 if ENABLE_RESOLVED
 
 systemd_resolved_SOURCES = \
@@ -5799,7 +5835,7 @@ EXTRA_DIST += \
 	test/loopy.service.d \
 	test/loopy.service.d/compat.conf
 
-#@src/compat-libs/Makefile -----------------------------------------------------
+#@src/libsystemd/compat-libs/Makefile ------------------------------------------
 if ENABLE_COMPAT_LIBS
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
diff --git a/move.sh b/move.sh
index 0312b2d36f..6867691ca3 100755
--- a/move.sh
+++ b/move.sh
@@ -9,8 +9,95 @@ in_array() {
 	return 1 # Not Found
 }
 
+set -e
+
+(
+	for d in libsystemd libudev machine resolve; do
+		mkdir src/$d-new
+		mv -T src/$d src/$d-new/src
+		mv -T src/$d-new src/$d
+	done
+
+	for d in basic core shared; do
+		mv -T src/{,lib}$d
+	done
+
+	pfix=(
+		activate
+		analyze
+		ask-password
+		backlight
+		binfmt
+		bootchart
+		cgls
+		cgroups-agent
+		cgtop
+		cryptsetup
+		delta
+		escape
+		notify
+		nspawn
+		path
+		quotacheck
+		random-seed
+		remount-fs
+		reply-password
+		rfkill
+		run
+		timedate
+		timesync
+		tmpfiles
+		tty-ask-password-agent
+		update-done
+		update-utmp
+		user-sessions
+		vconsole
+	)
+	for d in "${pfix[@]}"; do
+		mv -T src/{,systemd-}$d
+	done
+
+
+	mv -T {,src/journal/}catalog
+
+	mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install
+	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
+	mv -T {man,src/kernel-install}/kernel-install.xml
+
+	mv -T src/lib{shared,core}/linux
+
+	mv -T src/{,libsystemd/}/compat-libs
+	mkdir src/libsystemd/include
+	mv -T src/{,libsystemd/include}/systemd
+
+	mv -T src/{,machine}/nss-mymachines
+	mv -T src/{,resolve}/nss-resolve
+
+	mkdir src/system
+	mv -T src/{,system}/systemctl
+
+	mkdir src/libfirewall
+	mv -T src/lib{shared,firewall}/firewall-util.c
+	mv -T src/lib{shared,firewall}/firewall-util.h
+
+	mkdir src/system/systemd
+	mv -T src/{libcore,system/systemd}/main.c
+	mv -T src/{libcore,system/systemd}/macros.systemd.in
+	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.conf
+	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.policy.in.in
+	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.service
+	mv -T src/{libcore,system/systemd}/system.conf
+	mv -T src/{libcore,system/systemd}/systemd.pc.in
+	mv -T src/{libcore,system/systemd}/triggers.systemd.in
+	mv -T src/{libcore,system/systemd}/user.conf
+
+	mkdir src/libudev/include
+	mv -T src/libudev/{src,include}/libudev.h
+
+	mv -T {man,src/systemd-activate}/systemd-activate.xml
+)
+
 (
-        set -e
         find . \( -name Makefile -o -name '*.mk' \) -delete
 
         touch .tmp.move.all
@@ -24,10 +111,10 @@ in_array() {
                 elif [[ $file = all ]]; then
                         printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null
                 else
-                        if ! in_array "$file" "${files[@]}"; then
-                                cat .tmp.move.all > "$file"
-                                files+=("$file")
-                        fi
+			if ! in_array "$file" "${files[@]}"; then
+				cat .tmp.move.all > "$file"
+				files+=("$file")
+			fi
                         printf '%s\n' "$line" >> "$file"
                 fi
         done < Makefile.am