This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=519118e24a626e27d53493e7c261473c9bd8f059 commit 519118e24a626e27d53493e7c261473c9bd8f059 Author: Guillem Jover <[email protected]> AuthorDate: Sun Jan 28 20:07:07 2024 +0100 build: Reorder automake variables Place library files or modules first before the programs that uses them. Split and move EXTRA_DIST and CLEANFILES closer to the sections related to the listed files. Add blank lines between variables. --- Makefile.am | 9 ++-- dselect/methods/Makefile.am | 10 ++-- lib/dpkg/Makefile.am | 25 ++++++--- man/Makefile.am | 9 ++-- scripts/Makefile.am | 129 +++++++++++++++++++++++--------------------- utils/Makefile.am | 32 ++++++----- 6 files changed, 122 insertions(+), 92 deletions(-) diff --git a/Makefile.am b/Makefile.am index d2874b4da..7186045d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,9 +107,6 @@ EXTRA_DIST = \ debian/tests/test-root \ po/its/polkit.its \ po/its/polkit.loc \ - tests \ - $(test_scripts) \ - $(test_data) \ # EOL .PHONY: doc @@ -210,6 +207,12 @@ test_data = \ t/critic/perlcriticrc \ # EOL +EXTRA_DIST += \ + tests \ + $(test_scripts) \ + $(test_data) \ + # EOL + # We need to use absolute paths here due to strict.t invoking a sub-perl, # while changing dir to source dir on out-of-tree builds. TEST_ENV_VARS = \ diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index de31c4793..d123977c7 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -1,5 +1,10 @@ ## Process this file with automake to produce Makefile.in +nobase_dist_perllib_DATA = \ + Dselect/Method.pm \ + Dselect/Method/Ftp.pm \ + # EOL + nobase_dist_methods_DATA = \ file/names \ file/desc.file \ @@ -21,11 +26,6 @@ nobase_methods_SCRIPTS = \ media/update \ # EOL -nobase_dist_perllib_DATA = \ - Dselect/Method.pm \ - Dselect/Method/Ftp.pm \ - # EOL - EXTRA_DIST = \ file/setup.sh \ file/update.sh \ diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 048df8838..1f02cc362 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -17,14 +17,9 @@ LDADD = \ ../compat/libcompat.la \ # EOL -DISTCLEANFILES = -EXTRA_DIST = \ - $(test_scripts) \ - $(test_data) \ - libdpkg.map \ - libdpkg.pc.in \ - # EOL +EXTRA_DIST = +DISTCLEANFILES = pkgconfig_DATA = libdpkg.pc @@ -37,6 +32,7 @@ EXTRA_libdpkg_la_DEPENDENCIES = \ libdpkg_la_LDFLAGS = \ -no-undefined \ # EOL + if HAVE_LINKER_VERSION_SCRIPT libdpkg_la_LDFLAGS += \ -Wl,--version-script=$(srcdir)/libdpkg.map \ @@ -45,14 +41,18 @@ else libdpkg_la_LDFLAGS += \ -export-symbols libdpkg.sym \ # EOL + EXTRA_libdpkg_la_DEPENDENCIES += \ libdpkg.sym \ # EOL endif + libdpkg_la_LDFLAGS += $(MD_LIBS) + libdpkg_la_LIBADD = \ ../compat/libcompat.la \ # EOL + if BUILD_SHARED libdpkg_la_LIBADD += \ $(LIBINTL) \ @@ -62,6 +62,7 @@ libdpkg_la_LIBADD += \ $(BZ2_LIBS) \ # EOL endif + libdpkg_la_SOURCES = \ dlist.h \ ar.c \ @@ -192,6 +193,11 @@ pkginclude_HEADERS = \ version.h \ # EOL +EXTRA_DIST += \ + libdpkg.map \ + libdpkg.pc.in \ + # EOL + DISTCLEANFILES += \ libdpkg.sym \ # EOL @@ -265,6 +271,11 @@ test_data = \ t/data/meminfo-ok \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + $(test_data) \ + # EOL + BENCHMARK_LDADD_FLAGS = \ $(RT_LIBS) \ $(LDADD) \ diff --git a/man/Makefile.am b/man/Makefile.am index 5b437a3e2..4f4e462d7 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +EXTRA_DIST = +CLEANFILES = + man_MANS = \ deb-buildinfo.5 \ deb-changelog.5 \ @@ -80,9 +83,7 @@ man_MANS += \ # EOL endif -CLEANFILES = $(man_MANS) - -EXTRA_DIST = \ +EXTRA_DIST += \ po/ChangeLog.old \ po/dpkg-man.pot \ po/po4a.cfg \ @@ -155,6 +156,8 @@ EXTRA_DIST += \ update-alternatives.pod \ # EOL +CLEANFILES += $(man_MANS) + # Extract the list of languages from the po4a config file. LINGUAS_DIST = `$(SED) -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f9f09ce7a..01b154789 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,66 +2,8 @@ SUBDIRS = mk po -sbin_SCRIPTS = \ - dpkg-fsys-usrunmess \ - # EOL - -bin_SCRIPTS = \ - dpkg-architecture \ - dpkg-buildflags \ - dpkg-buildapi \ - dpkg-buildpackage \ - dpkg-buildtree \ - dpkg-checkbuilddeps \ - dpkg-distaddfile \ - dpkg-genbuildinfo \ - dpkg-genchanges \ - dpkg-gencontrol \ - dpkg-gensymbols \ - dpkg-mergechangelogs \ - dpkg-name \ - dpkg-parsechangelog \ - dpkg-scanpackages \ - dpkg-scansources \ - dpkg-shlibdeps \ - dpkg-source \ - dpkg-vendor \ - # EOL - -EXTRA_DIST = \ - dpkg-architecture.pl \ - dpkg-buildapi.pl \ - dpkg-buildflags.pl \ - dpkg-buildpackage.pl \ - dpkg-buildtree.pl \ - dpkg-checkbuilddeps.pl \ - dpkg-distaddfile.pl \ - dpkg-fsys-usrunmess.pl \ - dpkg-genbuildinfo.pl \ - dpkg-genchanges.pl \ - dpkg-gencontrol.pl \ - dpkg-gensymbols.pl \ - dpkg-mergechangelogs.pl \ - dpkg-name.pl \ - dpkg-parsechangelog.pl \ - dpkg-scanpackages.pl \ - dpkg-scansources.pl \ - dpkg-shlibdeps.pl \ - dpkg-source.pl \ - dpkg-vendor.pl \ - $(test_scripts) \ - $(test_data) \ - # EOL - -dist_zshcompletions_DATA = \ - completion/zsh/_dpkg-parsechangelog \ - # EOL - -CLEANFILES = \ - $(test_data_objects) \ - $(sbin_SCRIPTS) \ - $(bin_SCRIPTS) \ - # EOL +EXTRA_DIST = +CLEANFILES = nobase_dist_perllib_DATA = \ Dpkg/Arch.pm \ @@ -155,6 +97,64 @@ EXTRA_DIST += \ Test/Dpkg.pm \ # EOL +sbin_SCRIPTS = \ + dpkg-fsys-usrunmess \ + # EOL + +bin_SCRIPTS = \ + dpkg-architecture \ + dpkg-buildflags \ + dpkg-buildapi \ + dpkg-buildpackage \ + dpkg-buildtree \ + dpkg-checkbuilddeps \ + dpkg-distaddfile \ + dpkg-genbuildinfo \ + dpkg-genchanges \ + dpkg-gencontrol \ + dpkg-gensymbols \ + dpkg-mergechangelogs \ + dpkg-name \ + dpkg-parsechangelog \ + dpkg-scanpackages \ + dpkg-scansources \ + dpkg-shlibdeps \ + dpkg-source \ + dpkg-vendor \ + # EOL + +EXTRA_DIST += \ + dpkg-architecture.pl \ + dpkg-buildapi.pl \ + dpkg-buildflags.pl \ + dpkg-buildpackage.pl \ + dpkg-buildtree.pl \ + dpkg-checkbuilddeps.pl \ + dpkg-distaddfile.pl \ + dpkg-fsys-usrunmess.pl \ + dpkg-genbuildinfo.pl \ + dpkg-genchanges.pl \ + dpkg-gencontrol.pl \ + dpkg-gensymbols.pl \ + dpkg-mergechangelogs.pl \ + dpkg-name.pl \ + dpkg-parsechangelog.pl \ + dpkg-scanpackages.pl \ + dpkg-scansources.pl \ + dpkg-shlibdeps.pl \ + dpkg-source.pl \ + dpkg-vendor.pl \ + # EOL + +CLEANFILES += \ + $(sbin_SCRIPTS) \ + $(bin_SCRIPTS) \ + # EOL + +dist_zshcompletions_DATA = \ + completion/zsh/_dpkg-parsechangelog \ + # EOL + # Keep it even if empty to have man3dir correctly set man3_MANS = @@ -421,6 +421,11 @@ test_data = \ t/origins/ubuntu \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + $(test_data) \ + # EOL + test_data_objects = \ t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \ t/Dpkg_Shlibs/libobjdump.basictags-i386.so \ @@ -429,6 +434,10 @@ test_data_objects = \ t/Dpkg_Shlibs/libobjdump.spacesyms.so \ # EOL +CLEANFILES += \ + $(test_data_objects) \ + # EOL + $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c $(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \ -DAMD64 -o $@ diff --git a/utils/Makefile.am b/utils/Makefile.am index 98e88abfc..433ee2490 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -11,23 +11,16 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ # EOL -CLEANFILES = \ - org.dpkg.pkexec.update-alternatives.policy \ - # EOL - -EXTRA_DIST = \ - README.alternatives \ - update-alternatives.polkit.in \ - $(test_scripts) \ - # EOL - -polkitactions_DATA = - +sbin_PROGRAMS = bin_PROGRAMS = +polkitactions_DATA = +EXTRA_DIST = +CLEANFILES = if BUILD_UPDATE_ALTERNATIVES -polkitactions_DATA += org.dpkg.pkexec.update-alternatives.policy bin_PROGRAMS += update-alternatives + +polkitactions_DATA += org.dpkg.pkexec.update-alternatives.policy endif do_polkit_subst = $(SED) \ @@ -56,7 +49,14 @@ update_alternatives_LDADD = \ $(LIBINTL) \ # EOL -sbin_PROGRAMS = +EXTRA_DIST += \ + README.alternatives \ + update-alternatives.polkit.in \ + # EOL + +CLEANFILES += \ + org.dpkg.pkexec.update-alternatives.policy \ + # EOL if BUILD_START_STOP_DAEMON sbin_PROGRAMS += start-stop-daemon @@ -95,6 +95,10 @@ test_scripts = \ t/update_alternatives.t \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + # EOL + include $(top_srcdir)/build-aux/tap.am check-local: tap-check -- Dpkg.Org's dpkg
