* [gentoo-commits] gentoo-projects commit in portage-utils: Makefile Makefile.am make-tarball.sh
@ 2011-12-11 21:38 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2011-12-11 21:38 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/11 21:38:41
Modified: Makefile Makefile.am make-tarball.sh
Log:
clean up generated autotool output so it is easier to compare when it changes
Revision Changes Path
1.71 portage-utils/Makefile
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile?r1=1.70&r2=1.71
Index: Makefile
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile 11 Dec 2011 05:49:22 -0000 1.70
+++ Makefile 11 Dec 2011 21:38:41 -0000 1.71
@@ -1,6 +1,6 @@
# Copyright 2005-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.70 2011/12/11 05:49:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.71 2011/12/11 21:38:41 vapier Exp $
####################################################################
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
@@ -49,20 +49,6 @@
all: q
@true
-EXTRA_DIST = \
- $(SRC) \
- qglsa.c \
- $(wildcard libq/*.c *.h libq/*.h) \
- $(shell find tests -type f '!' -ipath '*/CVS/*')
-autotools-update:
- sed -i \
- -e '/^APPLETS =/s:=.*:= $(APPLETS):' \
- -e '/^EXTRA_DIST =/s:=.*:= $(EXTRA_DIST):' \
- -e '/^dist_man_MANS =/s:=.*:= $(wildcard man/*.1):' \
- Makefile.am
-autotools: autotools-update
- ./autogen.sh --from=make
-
debug:
$(MAKE) CFLAGS="$(CFLAGS) -O0 -DEBUG -g3 -ggdb -fno-pie" clean symlinks
@-scanelf -o /dev/null -BXxz permsx q
@@ -135,3 +121,26 @@
-include .depend
.PHONY: all autotools check clean debug dist distclean install man symlinks testclean
+
+#
+# All logic related to autotools is below here
+#
+GEN_MARK_START = \# @@@ GEN START @@@ \#
+GEN_MARK_END = \# @@@ GEN START @@@ \#
+EXTRA_DIST = \
+ $(SRC) \
+ qglsa.c \
+ $(wildcard libq/*.c *.h libq/*.h) \
+ $(shell find tests -type f '!' -ipath '*/CVS/*')
+MAKE_MULTI_LINES = $(patsubst %,\\\\\n\t%,$(sort $(1)))
+autotools-update:
+ sed -i '/^$(GEN_MARK_START)$$/,/^$(GEN_MARK_END)$$/d' Makefile.am
+ printf '%s\ndist_man_MANS += %b\nAPPLETS += %b\nEXTRA_DIST += %b\n%s\n' \
+ "$(GEN_MARK_START)" \
+ "$(call MAKE_MULTI_LINES,$(wildcard man/*.1))" \
+ "$(call MAKE_MULTI_LINES,$(APPLETS))" \
+ "$(call MAKE_MULTI_LINES,$(EXTRA_DIST))" \
+ "$(GEN_MARK_END)" \
+ >> Makefile.am
+autotools: autotools-update
+ ./autogen.sh --from=make
1.3 portage-utils/Makefile.am
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile.am?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile.am?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/Makefile.am?r1=1.2&r2=1.3
Index: Makefile.am
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 11 Dec 2011 05:46:11 -0000 1.2
+++ Makefile.am 11 Dec 2011 21:38:41 -0000 1.3
@@ -10,15 +10,156 @@
$(LIB_CLOCK_GETTIME) \
$(LIB_EACCESS)
-# These lines are auto-generated, so don't touch them
-dist_man_MANS = man/qatom.1 man/qpkg.1 man/qlop.1 man/qsize.1 man/qxpak.1 man/qcache.1 man/qtbz2.1 man/qsearch.1 man/qgrep.1 man/qfile.1 man/qcheck.1 man/quse.1 man/qmerge.1 man/q.1 man/qlist.1 man/qdepends.1
-APPLETS = q qatom qcache qcheck qdepends qfile qgrep qlist qlop qmerge qpkg qsearch qsize qtbz2 quse qxpak
-EXTRA_DIST = q.c qatom.c qcache.c qcheck.c qdepends.c qfile.c qgrep.c qlist.c qlop.c qmerge.c qpkg.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c main.c qglsa.c libq/basename.c libq/rmspace.c libq/xarray.c libq/colors.c libq/atom_compare.c libq/virtuals.c libq/xasprintf.c libq/prelink.c libq/xreadlink.c libq/hash_fd.c libq/vdb_get_next_dir.c libq/profile.c libq/libq.c libq/safe_io.c libq/xchdir.c libq/compat.c libq/atom_explode.c libq/xstrdup.c libq/xmkdir.c libq/xmalloc.c libq/which.c libq/xgetcwd.c libq/human_readable.c libq/xregex.c libq/xsystem.c libq/md5_sha1_sum.c libq/copy_file.c applets.h main.h include_applets.h libq/libq.h libq/i18n.h libq/busybox.h tests/Makefile tests/quse/Makefile tests/quse/portdir/profiles/desc/one.desc tests/quse/portdir/profiles/desc/elibc.desc tests/quse/portdir/profiles/desc/two.desc tests/quse/portdir/profiles/arch.list tests/quse/portdir/profiles/use.local.desc tests/quse/portdir/profiles/use.desc tests/quse/list01.good tests/quse/dotest tes
ts/atom_explode/Makefile tests/atom_explode/basic.good tests/atom_explode/atom-explode.py tests/atom_explode/.cvsignore tests/atom_explode/dotest tests/atom_explode/basic.tests tests/atom_explode/basic tests/atom_explode/test.c tests/install/Makefile tests/install/dotest tests/source/Makefile tests/source/space tests/source/dotest tests/source/x tests/qfile/Makefile tests/qfile/dotest tests/qxpak/Makefile tests/qxpak/list01.good tests/qxpak/dotest tests/qxpak/list02.good tests/qlist/Makefile tests/qlist/list06.good tests/qlist/list05.good tests/qlist/root/cat/pkg-1/CONTENTS tests/qlist/root/a-b/a-0/CONTENTS tests/qlist/root/a-b/b-0/CONTENTS tests/qlist/root/sys-fs/mtools-4.0.13/CONTENTS tests/qlist/root/-merge-foo/CONTENTS tests/qlist/root/app-arch/cpio-2.11/CONTENTS tests/qlist/list01.good tests/qlist/dotest tests/qlist/list03.good tests/qlist/list02.good tests/qlist/list04.good tests/reinitialize/Makefile tests/reinitialize/dotest tests/mkdir/Makefile tests/mkdir/dotest te
sts/mkdir/test.c tests/qtbz2/Makefile tests/qtbz2/dotest tests/init.sh tests/atom_compare/Makefile tests/atom_compare/static.tests tests/atom_compare/atom-compare.py tests/atom_compare/static.good
-
-EXTRA_DIST += autotools/m4/gnulib-cache.m4
-
install-exec-hook:
cd $(DESTDIR)$(bindir); \
for applet in $(APPLETS) ; do \
[ ! -e "$$applet" ] && ln -s q $${applet} ; \
done
+
+# Start off with base values which we append below
+dist_man_MANS =
+APPLETS =
+EXTRA_DIST = autotools/m4/gnulib-cache.m4
+
+# @@@ GEN START @@@ #
+dist_man_MANS += \
+ man/q.1 \
+ man/qatom.1 \
+ man/qcache.1 \
+ man/qcheck.1 \
+ man/qdepends.1 \
+ man/qfile.1 \
+ man/qgrep.1 \
+ man/qlist.1 \
+ man/qlop.1 \
+ man/qmerge.1 \
+ man/qpkg.1 \
+ man/qsearch.1 \
+ man/qsize.1 \
+ man/qtbz2.1 \
+ man/quse.1 \
+ man/qxpak.1
+APPLETS += \
+ q \
+ qatom \
+ qcache \
+ qcheck \
+ qdepends \
+ qfile \
+ qgrep \
+ qlist \
+ qlop \
+ qmerge \
+ qpkg \
+ qsearch \
+ qsize \
+ qtbz2 \
+ quse \
+ qxpak
+EXTRA_DIST += \
+ applets.h \
+ include_applets.h \
+ libq/atom_compare.c \
+ libq/atom_explode.c \
+ libq/basename.c \
+ libq/busybox.h \
+ libq/colors.c \
+ libq/compat.c \
+ libq/copy_file.c \
+ libq/hash_fd.c \
+ libq/human_readable.c \
+ libq/i18n.h \
+ libq/libq.c \
+ libq/libq.h \
+ libq/md5_sha1_sum.c \
+ libq/prelink.c \
+ libq/profile.c \
+ libq/rmspace.c \
+ libq/safe_io.c \
+ libq/vdb_get_next_dir.c \
+ libq/virtuals.c \
+ libq/which.c \
+ libq/xarray.c \
+ libq/xasprintf.c \
+ libq/xchdir.c \
+ libq/xgetcwd.c \
+ libq/xmalloc.c \
+ libq/xmkdir.c \
+ libq/xreadlink.c \
+ libq/xregex.c \
+ libq/xstrdup.c \
+ libq/xsystem.c \
+ main.c \
+ main.h \
+ q.c \
+ qatom.c \
+ qcache.c \
+ qcheck.c \
+ qdepends.c \
+ qfile.c \
+ qglsa.c \
+ qgrep.c \
+ qlist.c \
+ qlop.c \
+ qmerge.c \
+ qpkg.c \
+ qsearch.c \
+ qsize.c \
+ qtbz2.c \
+ quse.c \
+ qxpak.c \
+ tests/Makefile \
+ tests/atom_compare/Makefile \
+ tests/atom_compare/atom-compare.py \
+ tests/atom_compare/static.good \
+ tests/atom_compare/static.tests \
+ tests/atom_explode/.cvsignore \
+ tests/atom_explode/Makefile \
+ tests/atom_explode/atom-explode.py \
+ tests/atom_explode/basic.good \
+ tests/atom_explode/basic.tests \
+ tests/atom_explode/dotest \
+ tests/atom_explode/test.c \
+ tests/init.sh \
+ tests/install/Makefile \
+ tests/install/dotest \
+ tests/mkdir/Makefile \
+ tests/mkdir/dotest \
+ tests/mkdir/test.c \
+ tests/qfile/Makefile \
+ tests/qfile/dotest \
+ tests/qlist/Makefile \
+ tests/qlist/dotest \
+ tests/qlist/list01.good \
+ tests/qlist/list02.good \
+ tests/qlist/list03.good \
+ tests/qlist/list04.good \
+ tests/qlist/list05.good \
+ tests/qlist/list06.good \
+ tests/qlist/root/-merge-foo/CONTENTS \
+ tests/qlist/root/a-b/a-0/CONTENTS \
+ tests/qlist/root/a-b/b-0/CONTENTS \
+ tests/qlist/root/app-arch/cpio-2.11/CONTENTS \
+ tests/qlist/root/cat/pkg-1/CONTENTS \
+ tests/qlist/root/sys-fs/mtools-4.0.13/CONTENTS \
+ tests/qtbz2/Makefile \
+ tests/qtbz2/dotest \
+ tests/quse/Makefile \
+ tests/quse/dotest \
+ tests/quse/list01.good \
+ tests/quse/portdir/profiles/arch.list \
+ tests/quse/portdir/profiles/desc/elibc.desc \
+ tests/quse/portdir/profiles/desc/one.desc \
+ tests/quse/portdir/profiles/desc/two.desc \
+ tests/quse/portdir/profiles/use.desc \
+ tests/quse/portdir/profiles/use.local.desc \
+ tests/qxpak/Makefile \
+ tests/qxpak/dotest \
+ tests/qxpak/list01.good \
+ tests/qxpak/list02.good \
+ tests/reinitialize/Makefile \
+ tests/reinitialize/dotest \
+ tests/source/Makefile \
+ tests/source/dotest \
+ tests/source/space
+# @@@ GEN START @@@ #
1.19 portage-utils/make-tarball.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/make-tarball.sh?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/make-tarball.sh?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/make-tarball.sh?r1=1.18&r2=1.19
Index: make-tarball.sh
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/make-tarball.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- make-tarball.sh 11 Dec 2011 05:49:22 -0000 1.18
+++ make-tarball.sh 11 Dec 2011 21:38:41 -0000 1.19
@@ -20,7 +20,7 @@
cvs -Q up
sed -i "/^AC_INIT/s:cvs:${ver}:" configure.ac
sed -i "1iPV := ${ver}" Makefile
-make autotools
+LC_ALL=C ${MAKE:-make} autotools
rm -rf autom4te.cache
cd ..
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-11 21:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-11 21:38 [gentoo-commits] gentoo-projects commit in portage-utils: Makefile Makefile.am make-tarball.sh Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox