Changeset 3395

Timestamp:

Jun 10, 2007, 9:23:12 PM (18 years ago)

Author:

bird

Message:

CHECK_TARGET and make grep keep quiet.

File:

• trunk/ports-make/rules.gmk (modified) (11 diffs)

trunk/ports-make/rules.gmk

@@ -15 +15 @@
 DO_CONFIG       += --cache-file=./configure.cache
 endif
-                        
+
 DO_MAKE      = MAKEFLAGS="$(firstword $(MAKEFLAGS))" $(SET_MAKE) $(GNUMAKE) pm_buildts="$(pm_buildts)"
 ifdef LT_OS2_LDFLAGS
@@ -48 +48 @@
 .NOTPARALLEL: kill
 
-#       
-## da worker rulez                                                                      
+#
+## da worker rulez
 #
 config build dep check dist install packing nothing:
@@ -68 +68 @@
 
 #
-## auto[make/conf]                              
+## auto[make/conf]
 #
 auto:
@@ -75 +75 @@
                 if $(MAKE) -C $$dir -f $(pm_makefile) do-$@ pm_makefile="$(pm_makefile)" pm_topdir=$(pm_topdir); then true; else exit 1; fi; \
         done
-        
+
 do-auto:
         rm -f aclocal config.in.h~ config-h.in~ config.h.in~ config.in~ configure
-        if grep -q AM_CONFIG_HEADER configure.ac; then \
+        if grep -q AM_CONFIG_HEADER configure.ac 2> nul > nul; then \
                 rm -f config.in.h config-h.in config.h.in; \
-        fi              
+        fi
         if test -z "$(NO_ACLOCAL)"; then \
                 ash -c "$(ACLOCAL) $(OPT_ACLOCAL) $(OPT_AUTO)"; \
@@ -86 +86 @@
         if ls *-h.in 2> nul > nul || ls *.h.in 2> nul > nul || test -f config.in || grep -q AM_CONFIG_HEADER configure.ac; then \
                 $(AUTOHEADER) $(OPT_AUTOHEADER) $(OPT_AUTO); \
-        fi              
+        fi
         if ls *.am 2> nul > nul; then \
                 $(AUTOMAKE) $(OPT_AUTOMAKE) $(OPT_AUTO); \
@@ -92 +92 @@
         ash -c "$(AUTOCONF) $(OPT_AUTOCONF) $(OPT_AUTO)"
 
-#               
+#
 ## configure
 #
 ifndef HAVE_DO_CONFIG
-do-config:      
+do-config:
         $(DO_CONFIG) $(OPT_CONFIG)
-endif   
+endif
 
 #
 ## build
 #
-do-build:       
+do-build:
         $(DO_MAKE) $(OPT_BUILD)   all
 
@@ -109 +109 @@
 ## check
 #
-do-check:       
+CHECK_TARGET ?= check
+do-check:
 ifndef NO_CHECKS
-        $(DO_MAKE) $(OPT_CHECK)   check
-else    
+        $(DO_MAKE) $(OPT_CHECK)   $(CHECK_TARGET)
+else
         @echo "Sorry, no checks for this port."
 endif
@@ -123 +124 @@
 else
 _PM_VERSION_SUFF =
-endif   
-do-packing:     
+endif
+do-packing:
 ifdef pm_pack_base
 ifneq "$(pm_pack_base)" "/"
         rm -Rf $(pm_pack_base)
-endif   
-endif   
+endif
+endif
         $(DO_MAKE) $(OPT_PACKING) prefix="$(pm_pack_prefix)" bindir="$(pm_pack_bindir)" install
 ifdef PM_DOCS
         mkdir -p $(pm_pack_base)/$(pm_docdir)
         cp $(addprefix $(pm_srcdir)/,$(PM_DOCS)) $(pm_pack_base)/$(pm_docdir)/
-endif   
+endif
         rm -f $(pm_pack_base)/../$(pm_package)$(_PM_VERSION_SUFF).zip \
         rm -f $(pm_pack_base)/../$(pm_package).zip \
@@ -141 +142 @@
         cd $(pm_pack_base) && zip -9r ../$(pm_package)$(_PM_VERSION_SUFF).zip *
         cd $(pm_srcdir)/..  && zip -9r $(pm_pack_base)/../$(pm_package)$(_PM_VERSION_SUFF)-source.zip $(notdir $(pm_srcdir))/* -x \*CVS\*
-        
+
 #
-## install      
+## install
 #
-do-install:     
+do-install:
         $(DO_MAKE) $(OPT_INSTALL) prefix="$(pm_inst_prefix)" bindir="$(pm_inst_bindir)" install
 ifdef PM_DOCS
         mkdir -p $(pm_inst_base)/$(pm_docdir)
         cp $(addprefix $(pm_srcdir)/,$(PM_DOCS)) $(pm_inst_base)/$(pm_docdir)/
-endif   
+endif
 
 #
-## clean and distclean  
+## clean and distclean
 #
-do-clean do-distclean:  
+do-clean do-distclean:
         $(DO_MAKE) $(OPT_CLEAN)   clean
 
 #
-## kill         
+## kill
 #
 kill:
@@ -165 +166 @@
 ifneq "$(pm_objdir)" "/"
         rm -Rf $(pm_objdir)
-endif   
-endif   
+endif
+endif
 ifdef pm_pack_base
 ifneq "$(pm_pack_base)" "/"
         rm -Rf $(pm_pack_base)
-endif   
-endif   
+endif
+endif
 
 #
-## shell                
+## shell
 #
 do-shell:
@@ -184 +185 @@
 
 #
-## nothing              
+## nothing
 #
 do-nothing: