diff options
| -rw-r--r-- | Makefile.am | 92 | ||||
| -rw-r--r-- | am-pretty.mk | 23 | ||||
| -rw-r--r-- | common.once.head.mk | 18 | ||||
| -rw-r--r-- | discard.mk | 30 | ||||
| -rwxr-xr-x | move.sh | 97 | ||||
| -rw-r--r-- | src/libcore/Makefile | 14 | ||||
| -rw-r--r-- | src/libfirewall/Makefile | 22 | ||||
| -rw-r--r-- | src/libsystemd/Makefile | 39 | ||||
| -rw-r--r-- | src/libsystemd/src/Makefile | 17 | ||||
| -rw-r--r-- | src/libudev/Makefile | 35 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 13 | ||||
| -rw-r--r-- | src/system/systemd/Makefile | 2 |
12 files changed, 281 insertions, 121 deletions
diff --git a/Makefile.am b/Makefile.am index 1871a87aec..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 @@ -414,7 +414,7 @@ AM_V_lt_ = $(AM_V_lt_$(AM_DEFAULT_VERBOSITY)) AM_V_lt_0 = --silent AM_V_lt_1 = -#@discard.mk-------------------------------------------------------------------- +#@discard.mk ------------------------------------------------------------------- rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -796,7 +796,7 @@ EXTRA_DIST += \ tools/xml_helper.py \ man/glib-event-glue.c -#@src/basic/Makefile ----------------------------------------------------------- +#@src/libbasic/Makefile -------------------------------------------------------- noinst_LTLIBRARIES += \ libbasic.la @@ -1015,7 +1015,7 @@ libbasic_la_LIBADD = \ -lrt \ -lm -#@src/shared/Makefile --------------------------------------------------------- +#@src/libshared/Makefile ------------------------------------------------------- noinst_LTLIBRARIES += \ libshared.la @@ -1130,7 +1130,7 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -#@src/libfirewall/Makefile ---------------------------------------------------- +#@src/libfirewall/Makefile ----------------------------------------------------- if HAVE_LIBIPTC noinst_LTLIBRARIES += \ libfirewall.la @@ -1147,7 +1147,7 @@ libfirewall_la_LIBADD = \ $(LIBIPTC_LIBS) endif -#@discard.mk ------------------------------------------------------------------ +#@discard.mk ------------------------------------------------------------------- if ENABLE_LDCONFIG dist_systemunit_DATA += \ units/ldconfig.service @@ -1156,7 +1156,7 @@ SYSINIT_TARGET_WANTS += \ ldconfig.service endif -#@src/core/Makefile ------------------------------------------------------------ +#@src/libcore/Makefile --------------------------------------------------------- noinst_LTLIBRARIES += \ libcore.la @@ -1341,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; }' >$@ @@ -1416,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/systemd/Makefile --------------------------------------------------------- +#@src/system/systemd/Makefile -------------------------------------------------- systemd_SOURCES = \ src/core/main.c @@ -2315,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 \ @@ -2336,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 @@ -2348,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 \ @@ -2403,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 @@ -2580,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 @@ -2900,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 \ @@ -2909,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 \ @@ -3016,7 +3016,7 @@ systemd_nspawn_LDADD += \ libfirewall.la endif -#@src/run/Makefile ------------------------------------------------------------- +#@src/systemd-run/Makefile ----------------------------------------------------- systemd_run_SOURCES = \ src/run/run.c @@ -3077,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 \ @@ -3555,7 +3555,7 @@ tests += \ test-dhcp6-client \ test-lldp -#@src/libudev/Makefile --------------------------------------------------------- +#@src/libudev/src/Makefile ----------------------------------------------------- include_HEADERS += \ src/libudev/libudev.h @@ -3953,7 +3953,7 @@ test_id128_LDADD = \ tests += \ test-id128 -#@src/activate/Makefile -------------------------------------------------------- +#@src/systemd-activate/Makefile ------------------------------------------------ rootlibexec_PROGRAMS += \ systemd-activate @@ -4513,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 @@ -4544,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 @@ -4569,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 \ @@ -4595,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 @@ -4616,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 @@ -4638,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 @@ -4656,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 @@ -4677,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 @@ -4765,7 +4765,7 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-hostnamed.service.in -#@src/core/Makefile ------------------------------------------------------------ +#@src/system/systemd/Makefile -------------------------------------------------- dist_systemunit_DATA_busnames += \ units/org.freedesktop.systemd1.busname @@ -4837,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 @@ -4891,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 \ @@ -4952,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 \ @@ -5221,7 +5221,7 @@ EXTRA_DIST += \ units/systemd-importd.service.in -#@src/resolve/Makefile --------------------------------------------------------- +#@src/resolve/src/Makefile ----------------------------------------------------- if ENABLE_RESOLVED systemd_resolved_SOURCES = \ @@ -5835,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/am-pretty.mk b/am-pretty.mk index b04dd3ceb8..4005034d30 100644 --- a/am-pretty.mk +++ b/am-pretty.mk @@ -1,3 +1,25 @@ +# -*- 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/>. AM_V_M4 = $(AM_V_M4_$(V)) AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) AM_V_M4_0 = @echo " M4 " $@; @@ -52,3 +74,4 @@ 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 = + diff --git a/common.once.head.mk b/common.once.head.mk index 85c2898e88..d0b72a4b92 100644 --- a/common.once.head.mk +++ b/common.once.head.mk @@ -23,6 +23,8 @@ MAKEFLAGS += --no-builtin-rules ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AM_MAKEFLAGS = --no-print-directory +AUTOMAKE_OPTIONS = color-tests parallel-tests GCC_COLORS ?= 'ooh, shiny!' export GCC_COLORS @@ -40,6 +42,14 @@ CPPFLAGS += -include $(topoutdir)/config.h # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile +%-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 }' <$< >$@ + +%-from-name.h: %-from-name.gperf + $(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 <$< >$@ + # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -52,14 +62,6 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -%-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 }' <$< >$@ - -%-from-name.h: %-from-name.gperf - $(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 <$< >$@ - # from GNU automake DEFAULT_INCLUDES = -I. diff --git a/discard.mk b/discard.mk index b21dc5d8af..7f746b325b 100644 --- a/discard.mk +++ b/discard.mk @@ -257,28 +257,6 @@ INSTALL_EXEC_HOOKS += \ INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook -# ------------------------------------------------------------------------------ -AM_V_M4 = $(AM_V_M4_$(V)) -AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) -AM_V_M4_0 = @echo " M4 " $@; - -AM_V_XSLT = $(AM_V_XSLT_$(V)) -AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) -AM_V_XSLT_0 = @echo " XSLT " $@; - -AM_V_GPERF = $(AM_V_GPERF_$(V)) -AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY)) -AM_V_GPERF_0 = @echo " GPERF " $@; - -AM_V_LN = $(AM_V_LN_$(V)) -AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY)) -AM_V_LN_0 = @echo " LN " $@; - -AM_V_RM = $(AM_V_RM_$(V)) -AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) -AM_V_RM_0 = @echo " RM " $@; - -# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -687,14 +665,6 @@ EXTRA_DIST += \ CLEANFILES += \ $(gperf_txt_sources) -%-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 }' <$< >$@ - -%-from-name.h: %-from-name.gperf - $(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 <$< >$@ - ## .PHONY so it always rebuilds it .PHONY: coverage lcov-run lcov-report coverage-sync @@ -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 diff --git a/src/libcore/Makefile b/src/libcore/Makefile index 746287ce61..87ec8ef9c3 100644 --- a/src/libcore/Makefile +++ b/src/libcore/Makefile @@ -20,7 +20,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. - noinst_LTLIBRARIES += \ libcore.la @@ -166,3 +165,16 @@ libcore_la_LIBADD = \ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ + +systemd_shutdown_SOURCES = \ + src/core/umount.c \ + src/core/umount.h \ + src/core/shutdown.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/killall.h \ + src/core/killall.c + +systemd_shutdown_LDADD = \ + libshared.la + diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index b12fe3c33a..f0697f1513 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -1,3 +1,25 @@ +# -*- 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/>. ifneq ($(HAVE_LIBIPTC),) noinst_LTLIBRARIES += \ libfirewall.la diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile new file mode 100644 index 0000000000..7e7f0d00fc --- /dev/null +++ b/src/libsystemd/Makefile @@ -0,0 +1,39 @@ +# -*- 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/>. +test-libsystemd-sym.c: \ + $(top_builddir)/src/libsystemd/libsystemd.sym \ + src/systemd/sd-journal.h \ + src/systemd/sd-daemon.h \ + src/systemd/sd-login.h \ + src/systemd/sd-bus.h \ + src/systemd/sd-utf8.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h \ + src/systemd/sd-event.h + $(generate-sym-test) + +nodist_test_libsystemd_sym_SOURCES = \ + test-libsystemd-sym.c +test_libsystemd_sym_LDADD = \ + libsystemd.la + diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index cf72f9ea95..01a31f1d17 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -357,20 +357,3 @@ busctl_SOURCES = \ busctl_LDADD = \ libshared.la -test-libsystemd-sym.c: \ - $(top_builddir)/src/libsystemd/libsystemd.sym \ - src/systemd/sd-journal.h \ - src/systemd/sd-daemon.h \ - src/systemd/sd-login.h \ - src/systemd/sd-bus.h \ - src/systemd/sd-utf8.h \ - src/systemd/sd-resolve.h \ - src/systemd/sd-path.h \ - src/systemd/sd-event.h - $(generate-sym-test) - -nodist_test_libsystemd_sym_SOURCES = \ - test-libsystemd-sym.c -test_libsystemd_sym_LDADD = \ - libsystemd.la - diff --git a/src/libudev/Makefile b/src/libudev/Makefile new file mode 100644 index 0000000000..8aefffb488 --- /dev/null +++ b/src/libudev/Makefile @@ -0,0 +1,35 @@ +# -*- 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/>. +test-libudev-sym.c: \ + src/libudev/libudev.sym \ + src/udev/udev.h + $(generate-sym-test) + +nodist_test_libudev_sym_SOURCES = \ + test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations +test_libudev_sym_LDADD = \ + libudev.la + diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 3f1540b14a..2ff3272d48 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -75,16 +75,3 @@ noinst_LTLIBRARIES += \ libudev_internal_la_SOURCES =\ $(libudev_la_SOURCES) -test-libudev-sym.c: \ - src/libudev/libudev.sym \ - src/udev/udev.h - $(generate-sym-test) - -nodist_test_libudev_sym_SOURCES = \ - test-libudev-sym.c -test_libudev_sym_CFLAGS = \ - $(AM_CFLAGS) \ - -Wno-deprecated-declarations -test_libudev_sym_LDADD = \ - libudev.la - diff --git a/src/system/systemd/Makefile b/src/system/systemd/Makefile index e873ba3f94..16e2681222 100644 --- a/src/system/systemd/Makefile +++ b/src/system/systemd/Makefile @@ -20,7 +20,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. - systemd_SOURCES = \ src/core/main.c @@ -61,3 +60,4 @@ dist_systemunit_DATA_busnames += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.systemd1.busname + |