From 5e0446146dfc11e5653ff895630652733044e068 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 19:25:11 -0400 Subject: more renames --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1dabbb0819..f8d6d62a6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1420,7 +1420,7 @@ CLEANFILES += \ #@src/libbasic/include/Makefile nested.subdirs += basic -#@src/libbasic/include/basic/Makefile +#@src/libbasic/include/systemd-basic/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - $@ -- cgit v1.2.3-54-g00ecf From 7e3290b73ee989e73e8bdddd3b1c7643077a9c1e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 22:38:16 -0400 Subject: add missing stub Makefiles --- Makefile.am | 12 ++++++++++++ tools/notsd-move | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index f8d6d62a6b..db99e0b403 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6820,16 +6820,28 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-initprogs/Makefile #@src/grp-initprogs/grp-sleep/Makefile #@src/grp-journal/grp-remote/Makefile +#@src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile +#@src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile +#@src/grp-journal/libjournal-core/src/Makefile #@src/grp-locale/Makefile #@src/grp-machine/Makefile #@src/grp-machine/grp-import/Makefile #@src/grp-machine/grp-import/libimport/Makefile +#@src/grp-machine/libmachine-core/src/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile +#@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile +#@src/grp-system/libcore/src/Makefile #@src/grp-timedate/Makefile #@src/grp-utils/Makefile +#@src/libsystemd-firewall/src/Makefile +#@src/libsystemd-gcrypt/Makefile +#@src/libsystemd-gcrypt/src/Makefile +#@src/libsystemd/src/sd-bus/Makefile +#@src/libsystemd/src/sd-hwdb/Makefile #@src/libudev/Makefile #@all diff --git a/tools/notsd-move b/tools/notsd-move index 50be86f623..ba021ac5f1 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -766,14 +766,12 @@ breakup_makefile() ( src/grp-udev/libudev-core/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-network/Makefile - ln -sT ../subdir.mk src/libsystemd/src/sd-bus/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-event/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-login/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-resolve/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-daemon/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-netlink/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-id128/Makefile - ln -sT ../subdir.mk src/libsystemd/src/sd-hwdb/Makefile ln -sT ../subdir.mk src/libsystemd/src/sd-device/Makefile ) -- cgit v1.2.3-54-g00ecf From 62462bb9d7d0866d320d449a77b65c8a011ec813 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 22:48:36 -0400 Subject: have libbasic gperf headers be private --- Makefile.am | 4 +--- tools/notsd-move | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index db99e0b403..5964a99bd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1418,9 +1418,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/libbasic/include/Makefile -nested.subdirs += basic -#@src/libbasic/include/systemd-basic/Makefile +#@src/libbasic/src/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - $@ diff --git a/tools/notsd-move b/tools/notsd-move index ba021ac5f1..4a5630c777 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -760,7 +760,7 @@ breakup_makefile() ( sed -ri \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ - src/libsystemd-basic/include/systemd-basic/Makefile \ + src/libsystemd-basic/src/Makefile \ src/libsystemd/src/Makefile \ src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile -- cgit v1.2.3-54-g00ecf From 3c6aba93563e4fcbe1cf96e7f646bef516882184 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 23:00:50 -0400 Subject: libmachine-core/src Makefile --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5964a99bd5..cdc8b70c5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5213,6 +5213,7 @@ systemd_machined_LDADD = \ rootlibexec_PROGRAMS += \ systemd-machined +#@src/grp-machine/libmachine-core/src/Makefile libmachine_core_la_SOURCES = \ src/machine/machine.c \ src/machine/machine.h \ @@ -6825,7 +6826,6 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-machine/Makefile #@src/grp-machine/grp-import/Makefile #@src/grp-machine/grp-import/libimport/Makefile -#@src/grp-machine/libmachine-core/src/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile #@src/grp-resolve/libbasic-dns/src/Makefile -- cgit v1.2.3-54-g00ecf From 85c75184085a332924392d3a96271ed34e7e9d4e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 23:20:10 -0400 Subject: Better Makefile splitting --- Makefile.am | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index cdc8b70c5e..df146b1d04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1209,7 +1209,7 @@ libsystemd_shared_la_LDFLAGS = \ $(AM_LDFLAGS) \ -release $(PACKAGE_VERSION) -#@auto/libfirewall/Makefile ---------------------------------------------------- +#@src/libsystemd-firewall/src/Makefile ----------------------------------------- if HAVE_LIBIPTC noinst_LTLIBRARIES += \ libfirewall.la @@ -1235,7 +1235,7 @@ SYSINIT_TARGET_WANTS += \ ldconfig.service endif # ENABLE_LDCONFIG -#@auto/libcore/Makefile -------------------------------------------------------- +#@src/grp-system/libcore/src/Makefile ------------------------------------------ noinst_LTLIBRARIES += \ libcore.la @@ -1480,7 +1480,7 @@ src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile src/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -4378,7 +4378,7 @@ test_audit_type_SOURCES = \ test_audit_type_LDADD = \ libjournal-core.la -#@auto/libjournal-core/Makefile +#@src/grp-journal/libjournal-core/src/Makefile libjournal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ src/journal/journald-kmsg.h \ @@ -5241,7 +5241,7 @@ machinectl_LDADD = \ rootbin_PROGRAMS += \ machinectl -#@auto/systemd-machined/Makefile +#@src/grp-machine/libmachine-core/test/Makefile test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c @@ -5251,6 +5251,7 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables +#@auto/systemd-machined/Makefile nodist_systemunit_DATA += \ units/systemd-machined.service @@ -5649,7 +5650,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile tests += \ test-dns-packet \ test-resolve-tables \ @@ -6821,26 +6822,21 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-journal/grp-remote/Makefile #@src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile #@src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile -#@src/grp-journal/libjournal-core/src/Makefile #@src/grp-locale/Makefile #@src/grp-machine/Makefile #@src/grp-machine/grp-import/Makefile #@src/grp-machine/grp-import/libimport/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile -#@src/grp-resolve/libbasic-dns/src/Makefile #@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile -#@src/grp-system/libcore/src/Makefile #@src/grp-timedate/Makefile #@src/grp-utils/Makefile -#@src/libsystemd-firewall/src/Makefile #@src/libsystemd-gcrypt/Makefile #@src/libsystemd-gcrypt/src/Makefile #@src/libsystemd/src/sd-bus/Makefile #@src/libsystemd/src/sd-hwdb/Makefile -#@src/libudev/Makefile #@all include $(topsrcdir)/build-aux/Makefile.tail.mk -- cgit v1.2.3-54-g00ecf From 34389c8372e65844696196fc4db7b0d3046c6a37 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 23:25:00 -0400 Subject: add missing Makefiles --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index df146b1d04..8154394e84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6826,13 +6826,16 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-machine/Makefile #@src/grp-machine/grp-import/Makefile #@src/grp-machine/grp-import/libimport/Makefile +#@src/grp-machine/libmachine-core/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile #@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile +#@src/grp-system/libcore/Makefile #@src/grp-timedate/Makefile #@src/grp-utils/Makefile +#@src/libsystemd-firewall/Makefile #@src/libsystemd-gcrypt/Makefile #@src/libsystemd-gcrypt/src/Makefile #@src/libsystemd/src/sd-bus/Makefile -- cgit v1.2.3-54-g00ecf From 7888137c2695828443b5d7488e6e33f7da74e0a5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 23:39:19 -0400 Subject: fixity --- Makefile.am | 5 ++--- tools/notsd-move | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 8154394e84..09beac93d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5650,7 +5650,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -#@src/grp-resolve/libbasic-dns/src/Makefile +#@src/grp-resolve/libbasic-dns/test/Makefile tests += \ test-dns-packet \ test-resolve-tables \ @@ -5728,7 +5728,7 @@ test_dnssec_complex_LDADD = \ #@auto/systemd-resolved/Makefile endif # ENABLE_RESOLVED -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile gperf_txt_sources += \ src/resolve/dns_type-list.txt @@ -6829,7 +6829,6 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-machine/libmachine-core/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile -#@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile #@src/grp-system/libcore/Makefile diff --git a/tools/notsd-move b/tools/notsd-move index c7a9b99e0b..36ca546a63 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -780,19 +780,23 @@ fixup_makefile() { -e '#### Specific complete strings #####' \ -e 's|\$\(CPP\) \$\(CFLAGS\) \$\(AM_CPPFLAGS\) \$\(CPPFLAGS\)|$(CPP) $(sd.ALL_CPPFLAGS)|g' \ -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ + \ -e '#### General cases #################' \ -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ -e 's|^if (.*)|ifneq ($(\1),)|' \ -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \ + \ -e '#### Rename helpers ################' \ -e 's|libbasic_la|libsystemd_basic_la|g' \ -e 's|libbasic|libsystemd-basic|g' \ - -e 's|libshared|libsystemd-shared|g' \ + -e 's|libsystemd-basic-dns|libbasic-dns|g' \ + \ -e 's|libshared_la|libsystemd_shared_la|g' \ - -e 's|libfirewall|libsystemd-firewall|g' \ + -e 's|libshared|libsystemd-shared|g' \ + \ -e 's|libfirewall_la|libsystemd_firewall_la|g' \ - -e 's|libsystemd-basic-dns|libbasic-dns|g' + -e 's|libfirewall|libsystemd-firewall|g' } breakup_zshcompletion() ( -- cgit v1.2.3-54-g00ecf