don't try to create kmod packages that contain no files

[openwrt.git] / include / prereq.mk

diff --git a/include/prereq.mk b/include/prereq.mk
index c51953b..e514855 100644 (file)
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -6,29 +6,30 @@
 #
 
 include $(TOPDIR)/rules.mk
 #
 
 include $(TOPDIR)/rules.mk

-include $(INCLUDE_DIR)/verbose.mk

 
 $(TMP_DIR):
        mkdir -p $@
 
 prereq:
 
 $(TMP_DIR):
        mkdir -p $@
 
 prereq:

-       @echo
-       @if [ -f $(TMP_DIR)/.prereq-error ]; then \
+       echo
+       if [ -f $(TMP_DIR)/.prereq-error ]; then \

                cat $(TMP_DIR)/.prereq-error; \
                echo; \
                rm -rf $(TMP_DIR); \
                false; \
        fi
                cat $(TMP_DIR)/.prereq-error; \
                echo; \
                rm -rf $(TMP_DIR); \
                false; \
        fi

-       @rm -rf $(TMP_DIR)
-       @mkdir -p $(TMP_DIR)
+       rm -rf $(TMP_DIR)
+       mkdir -p $(TMP_DIR)
+
+.SILENT: $(TMP_DIR) prereq

 
 define Require
   ifeq ($$(CHECK_$(1)),)
     prereq: prereq-$(1)
 
     prereq-$(1): $(TMP_DIR) FORCE
 
 define Require
   ifeq ($$(CHECK_$(1)),)
     prereq: prereq-$(1)
 
     prereq-$(1): $(TMP_DIR) FORCE

-               @echo -n "Checking '$(1)'... "
-               @if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \
+               echo -n "Checking '$(1)'... "
+               if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \

                        echo 'ok.'; \
                else \
                        echo 'failed.'; \
                        echo 'ok.'; \
                else \
                        echo 'failed.'; \


@@ -38,6 +39,8 @@ define Require
     check-$(1): FORCE
          $(call Require/$(1))
     CHECK_$(1):=1
     check-$(1): FORCE
          $(call Require/$(1))
     CHECK_$(1):=1

+
+    .SILENT: prereq-$(1) check-$(1)

   endif
 endef
 
   endif
 endef
 


@@ -69,7 +72,7 @@ define Require/working-gcc
 endef
 
 $(eval $(call Require,working-gcc, \
 endef
 
 $(eval $(call Require,working-gcc, \

-       No working GNU C Compiler was found on your system. \
+       No working GNU C Compiler (gcc) was found on your system. \

 ))
 
 define Require/working-g++
 ))
 
 define Require/working-g++


@@ -78,16 +81,26 @@ define Require/working-g++
 endef
 
 $(eval $(call Require,working-g++, \
 endef
 
 $(eval $(call Require,working-g++, \

-       No working GNU C++ Compiler was found on your system. \
+       No working GNU C++ Compiler (g++) was found on your system. \

 ))
 
 ))
 

+define Require/ncurses
+       echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
+               gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses -
+endef
+
+$(eval $(call Require,ncurses, \
+       No ncurses development files were not found on your system. \
+))
+
+

 define Require/zlib
        echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
 define Require/zlib
        echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \

-               gcc -x c -o $(TMP_DIR)/a.out -lz -
+               gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz -

 endef
 
 $(eval $(call Require,zlib, \
 endef
 
 $(eval $(call Require,zlib, \

-       The development version of zlib was not found on your system. \
+       No zlib development files were not found on your system. \

 ))
 
 
 ))
 
 


@@ -115,4 +128,6 @@ $(eval $(call RequireCommand,patch, \
        Please install patch. \
 ))
 
        Please install patch. \
 ))
 

-
+$(eval $(call RequireCommand,perl, \
+       Please install perl. \
+))