[Gsrc-commit] /srv/bzr/gsrc/trunk r1337: Generalize help target for gar.mk

[Brandon Invergo]

------------------------------------------------------------
revno: 1337
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-07 15:38:04 +0100
message:
  Generalize help target for gar.mk
modified:
  gar.lib.mk
  gar.lib/auto.mk
  gar.mk

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2012-12-01 11:18:42 +0000
+++ b/gar.lib.mk        2012-12-07 14:38:04 +0000
@@ -370,6 +370,17 @@
                rm $@; \
        fi
 
+
+####################### HELP RULES ######################
+
+help-%/configure:
+       @echo " ==> Running configure --help in $*"
+       cd $* && $(CONFIGURE_ENV) ./configure --help
+
+help-%/setup.py:
+       @echo " ==> Running python setup.py --help in $*"
+       cd $* && python setup.py --help
+
 #################### CONFIGURE RULES ####################
 
 ifneq ($(prefix),/usr/local/bin)

=== modified file 'gar.lib/auto.mk'
--- a/gar.lib/auto.mk   2010-12-20 11:45:48 +0000
+++ b/gar.lib/auto.mk   2012-12-07 14:38:04 +0000
@@ -11,6 +11,7 @@
 USE_PARALLEL ?= y
 #USE_TESTS ?= y
 
+HELP_SCRIPTS ?= $(WORKSRC)/configure
 CONFIGURE_SCRIPTS ?= \
        $(if $(USE_AUTORECONF),$(WORKSRC)/autoreconf,) \
        $(WORKSRC)/configure

=== modified file 'gar.mk'
--- a/gar.mk    2012-12-07 14:28:54 +0000
+++ b/gar.mk    2012-12-07 14:38:04 +0000
@@ -218,6 +218,12 @@
 ALL_BUILD_SCRIPTS = $(PRE_BUILD_SCRIPTS) $(BUILD_SCRIPTS) $(POST_BUILD_SCRIPTS)
 ALL_TEST_SCRIPTS = $(PRE_TEST_SCRIPTS) $(TEST_SCRIPTS) $(POST_TEST_SCRIPTS)
 ALL_INSTALL_SCRIPTS = $(PRE_INSTALL_SCRIPTS) $(INSTALL_SCRIPTS) 
$(POST_INSTALL_SCRIPTS)
+HELP_SCRIPTS ?=
+
+# help: display configuration/installation options, ie via ./configure --help
+help: extract $(addprefix help-,$(HELP_SCRIPTS))
+       $(DONADA)
+
 
 # configure            - Runs either GNU configure, one or more local
 #                                configure scripts or nothing, depending on
@@ -311,9 +317,6 @@
 install-deps: $(addprefix dep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if 
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS)) 
        $(DONADA)
 
-help: extract
-       cd $(WORKSRC) && ./configure --help
-
 test-build: clean install uninstall uninstall-pkg clean