[Gsrc-commit] /srv/bzr/gsrc/trunk r1565: improve GSRC all, package-list and clean targets

[Brandon Invergo]

------------------------------------------------------------
revno: 1565
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-06 14:18:42 +0100
message:
  improve GSRC all, package-list and clean targets
modified:
  GNUmakefile.am

=== modified file 'GNUmakefile.am'
--- a/GNUmakefile.am    2013-01-06 12:55:11 +0000
+++ b/GNUmakefile.am    2013-01-06 13:18:42 +0000
@@ -3,22 +3,6 @@
 bin_SCRIPTS = gsrc
 CLEANFILES = $(bin_SCRIPTS)
 
-GSRC =  gcc binutils gdb mpfr gmp
-GSRC += m4 make autoconf automake libtool bison gperf gawk
-GSRC += gettext libunistring
-GSRC += bash readline
-GSRC += tar cpio gzip grep sed
-GSRC += coreutils findutils inetutils idutils mailutils sharutils
-GSRC += diffutils wdiff patch ed
-GSRC += hello
-GSRC += emacs
-GSRC += texinfo groff
-GSRC += gnupg gnutls gsasl gss
-GSRC += grub 
-GSRC += ncurses screen
-GSRC += pies pth  stow  wget recutils
-#  libiconv guile gdbm  ghostscript parted  termcap  termutils  less pexec rcs 
time gnash
-
 find_packages = $(sort $(filter-out $(IGNORE),$(patsubst %/,%,$(filter 
%/,$(wildcard $(1))))))
 GNU_PACKAGES = $(call find_packages, gnu/*/)
 GNOME_PACKAGES = $(call find_packages, gnome/*/)
@@ -27,11 +11,20 @@
 ALPHA_PACKAGES = $(call find_packages, alpha/*/)
 
 PACKAGES ?= $(GNU_PACKAGES) $(GNOME_PACKAGES) $(GNUSTEP_PACKAGES) 
$(DEP_PACKAGES)
+PAGER ?= less
+PAGER_OPTS = "-r"
 
-all: PACKAGES = $(addprefix gnu/,$(GSRC))
-all: IGNORE_DEPS = libiconv gdbm guile libpng
 all:
-       $(MAKE) install IGNORE_DEPS="$(IGNORE_DEPS)" PACKAGES="$(PACKAGES)"
+       @fail= failcom='exit 1'; \
+       for f in x $(MAKEFLAGS); do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       for i in $(PACKAGES)  ; do \
+               if [ -d $$i ] ; then $(MAKE) -C $$i install || eval $$failcom;  
fi \
+       done
 
 DISPLAY = cat
 DOC = doc
@@ -41,8 +34,10 @@
 help: 
        @$(DISPLAY) $(DOC)/help.txt
 
-package-list: 
-       @echo $(notdir $(patsubst %/,%,$(PACKAGES)))
+package-list:
+       @for i in $(PACKAGES)  ; do \
+               if [ -d $$i ] ; then $(MAKE) -sC $$i pkg-info-curt || eval 
$$failcom;  fi \
+       done | $(PAGER) $(PAGER_OPTS)
 
 clean .DEFAULT:
        @fail= failcom='exit 1'; \