Changeset 503 in kBuild for trunk/src/gmake/tests/scripts/functions/wildcard

Timestamp:

Sep 15, 2006 5:09:38 AM (19 years ago)

Author:

bird

Message:

Untested merge with GNU Make v3.81 (vendor/gnumake/2005-05-16 -> vendor/gnumake/current).

File:

• trunk/src/gmake/tests/scripts/functions/wildcard (modified) (2 diffs)

trunk/src/gmake/tests/scripts/functions/wildcard

@@ -14 +14 @@
 the '*' wildcard as in the first test";
 
-if ($vos)
-{
-   $delete_command = "delete_file -no_ask";
-}
-else
-{
-   $delete_command = "rm";
-}
-
-
 open(MAKEFILE,"> $makefile");
 
@@ -30 +20 @@
 print MAKEFILE <<EOM;
 .PHONY: print1 print2 clean
-print1: ;\@echo \$(wildcard example.*)
+print1: ;\@echo \$(sort \$(wildcard example.*))
 print2:
-\t\@echo \$(wildcard example.?)
-\t\@echo \$(wildcard example.[a-z0-9])
-\t\@echo \$(wildcard example.[!A-Za-z_\\!])
+\t\@echo \$(sort \$(wildcard example.?))
+\t\@echo \$(sort \$(wildcard example.[a-z0-9]))
+\t\@echo \$(sort \$(wildcard example.[!A-Za-z_\\!]))
 clean:
-\t$delete_command \$(wildcard example.*)
+\t$delete_command \$(sort \$(wildcard example.*))
 EOM