From 169e94d68b82d7da6a4fc06c6ec2880e3e53196b Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 13 Jun 2009 18:11:17 +0000
Subject: improve usability with UNIX-like shells or a DOS command interpreters

---
 src/makefile.dj | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'src/makefile.dj')

diff --git a/src/makefile.dj b/src/makefile.dj
index 60f13f24d..4a460bad9 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -39,14 +39,6 @@ CFLAGS += -DUSE_ENVIRONMENT
 PROGRAM  = curl.exe
 OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
 
-ifneq ($(findstring COMMAND.COM,$(SHELL)),COMMAND.COM)
-  ifneq ($(findstring CMD.EXE,$(SHELL)),CMD.EXE)
-    ifneq ($(findstring 4DOS.COM,$(SHELL)),4DOS.COM)
-      IS_UNIX_SHELL = 1
-    endif
-  endif
-endif
-
 all: $(OBJ_DIR) config.h $(PROGRAM)
 	@echo Welcome to cURL
 
@@ -67,11 +59,27 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
 	groff -Tascii -man ../docs/curl.1 | \
 	perl -w mkhelp.pl ../docs/MANUAL > $@
 
-clean:
-	- rm -f $(OBJECTS) config.h
+# clean generated files
+#
+genclean:
+	- $(DELETE) config.h
+	- $(DELETE) hugehelp.c
+
+# clean object files and subdir
+#
+objclean: genclean
+	- $(DELETE) $(OBJ_DIR)$(DS)*.o
+	- $(RMDIR) $(OBJ_DIR)
+
+# clean without removing built program
+#
+clean: objclean
+	- $(DELETE) depend.dj
 
+# clean everything
+#
 realclean vclean: clean
-	- rm -f $(PROGRAM) hugehelp.c depend.dj
+	- $(DELETE) $(PROGRAM)
 
 -include depend.dj
 
-- 
cgit v1.2.3