From 926159940f7236c48428c391c4afaab97db0d751 Mon Sep 17 00:00:00 2001
From: Rejean Loyer <rejean.loyer@gmail.com>
Date: Wed, 14 Nov 2012 00:00:36 -0500
Subject: [PATCH] buildsystem,epj2make,ide,tarball; added cleantarget and
 adjusted realclean and distclean; no longer depend on clean. clean, realclean
 and distclean depend on cleantarget which in turn depends on objdir to
 prevent error messages when using cleantarget, clean, realclean and distclean
 targets on windows if objdir or targetdir are missing. updated all tarball
 makefiles.

---
 Makefile                          |  6 +++---
 compiler/Makefile                 |  9 ++++++++-
 compiler/bootstrap/Makefile       | 18 ++++++++++--------
 compiler/bootstrap/ecc/Makefile   |  4 ++--
 compiler/bootstrap/ecere/Makefile |  4 ++--
 compiler/bootstrap/ecp/Makefile   |  4 ++--
 compiler/bootstrap/ecs/Makefile   |  4 ++--
 compiler/bootstrap/libec/Makefile |  4 ++--
 compiler/ecc/Makefile             | 13 ++++++++-----
 compiler/ecp/Makefile             | 13 ++++++++-----
 compiler/ecs/Makefile             | 13 ++++++++-----
 compiler/libec/Makefile           | 14 ++++++++------
 deps/Makefile                     | 10 +++++++++-
 deps/freetype-2.3.12/Makefile     | 10 ++++++----
 deps/jpeg-6b/Makefile             | 10 ++++++----
 deps/libffi-3.0.11/Makefile       | 10 ++++++----
 deps/libpng-1.4.0/Makefile        | 10 ++++++----
 deps/libungif-4.1.1/Makefile      | 10 ++++++----
 deps/zlib/Makefile                | 10 ++++++----
 documentor/Makefile               | 13 ++++++++-----
 ear/Makefile                      |  6 +++++-
 ear/cmd/Makefile                  | 10 +++++-----
 ear/extract/Makefile              | 13 ++++++++-----
 ecere/Makefile                    | 15 ++++++++++-----
 ecere/Makefile.ecereCOM           | 13 ++++++++-----
 ecere/Makefile.vanilla            | 13 ++++++++-----
 eda/Makefile                      |  9 ++++++++-
 eda/drivers/sqlite/Makefile       | 13 ++++++++-----
 eda/drivers/sqliteCipher/Makefile | 13 ++++++++-----
 eda/libeda/Makefile               |  6 +++---
 epj2make/Makefile                 | 13 ++++++++-----
 ide/Makefile                      | 13 ++++++++-----
 ide/src/project/Project.ec        | 16 +++++++++++-----
 33 files changed, 214 insertions(+), 128 deletions(-)
 mode change 100644 => 100755 Makefile

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 711b716..292711d
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ else
 endif
 	cd ecere && $(MAKE) nores $(XBOOT)
 	cd ear && $(MAKE) nores $(XBOOT)
-	cd ecere && $(MAKE) cleantarget
+	cd ecere && $(MAKE) cleaneceretarget
 ifdef CROSS_TARGET
 	@$(call echo,Building 2nd stage ecere...)
 endif
@@ -360,7 +360,7 @@ endif
 	cd eda && $(MAKE) clean
 	@$(call echo,Done.)
 
-realclean:
+realclean: outputdirs
 	cd deps && $(MAKE) realclean
 	cd ecere && $(MAKE) realclean
 	cd compiler && $(MAKE) realclean
@@ -375,7 +375,7 @@ endif
 	$(call rmrq,obj/$(PLATFORM)/)
 	@$(call echo,Done.)
 
-distclean:
+distclean: outputdirs
 	cd deps && $(MAKE) distclean
 	cd ecere && $(MAKE) distclean
 	cd compiler && $(MAKE) distclean
diff --git a/compiler/Makefile b/compiler/Makefile
index be0b49e..defa486 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all bootstrap clean realclean distclean libec ecp ecc ecs
+.PHONY: all bootstrap cleantarget clean realclean distclean libec ecp ecc ecs
 .SILENT:
 
 CONFIG := release
@@ -37,6 +37,13 @@ bootstrap:
 	@$(call echo,Bootstrapping eC compiling tools...)
 	cd bootstrap && $(MAKE)
 
+cleantarget:
+	cd bootstrap && $(MAKE) cleantarget
+	cd libec && $(MAKE) cleantarget
+	cd ecp && $(MAKE) cleantarget
+	cd ecc && $(MAKE) cleantarget
+	cd ecs && $(MAKE) cleantarget
+
 clean:
 	cd bootstrap && $(MAKE) clean
 	cd libec && $(MAKE) clean
diff --git a/compiler/bootstrap/Makefile b/compiler/bootstrap/Makefile
index 1e243a7..8ff3b92 100644
--- a/compiler/bootstrap/Makefile
+++ b/compiler/bootstrap/Makefile
@@ -1,4 +1,4 @@
-.PHONY: bindir ecere libec ecp ecc ecs clean realclean distclean
+.PHONY: bindir ecere libec ecp ecc ecs cleantarget clean realclean distclean
 .SILENT:
 
 OBJ = obj/bin.$(PLATFORM)/
@@ -13,18 +13,20 @@ all: bindir ecere libec ecp ecc ecs
 bindir:
 	$(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
 
-clean: bindir
+cleantarget: bindir
+	$(call rmq,$(OBJ)ecp$(E) $(OBJ)ecc$(E) $(OBJ)ecs$(E))
+ifdef WINDOWS_TARGET
+	$(call rmq,$(OBJ)$(LP)ecere$(SO) $(OBJ)$(LP)ec$(SO))
+endif
+
+clean: cleantarget
 	cd ecere && $(MAKE) clean
 	cd libec && $(MAKE) clean
 	cd ecp && $(MAKE) clean
 	cd ecc && $(MAKE) clean
 	cd ecs && $(MAKE) clean
-	$(call rmq,$(OBJ)ecp$(E) $(OBJ)ecc$(E) $(OBJ)ecs$(E))
-ifdef WINDOWS_TARGET
-	$(call rmq,$(OBJ)$(LP)ecere$(SO) $(OBJ)$(LP)ec$(SO))
-endif
 
-realclean:
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 	cd ecere && $(MAKE) realclean
 	cd libec && $(MAKE) realclean
@@ -32,7 +34,7 @@ realclean:
 	cd ecc && $(MAKE) realclean
 	cd ecs && $(MAKE) realclean
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
 	cd ecere && $(MAKE) distclean
 	cd libec && $(MAKE) distclean
diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index 665b7e0..3e58619 100644
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -115,8 +115,8 @@ clean: objdir
 	$(call rmq,$(TARGET))
 	$(call rmq,$(OBJECTS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/compiler/bootstrap/ecere/Makefile b/compiler/bootstrap/ecere/Makefile
index e4b58c1..973dd5f 100644
--- a/compiler/bootstrap/ecere/Makefile
+++ b/compiler/bootstrap/ecere/Makefile
@@ -214,8 +214,8 @@ clean: objdir
 	$(call rmq,$(TARGET))
 	$(call rmq,$(OBJECTS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index c0239c8..f099f9a 100644
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -115,8 +115,8 @@ clean: objdir
 	$(call rmq,$(TARGET))
 	$(call rmq,$(OBJECTS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index 387d0a1..c3c8576 100644
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -115,8 +115,8 @@ clean: objdir
 	$(call rmq,$(TARGET))
 	$(call rmq,$(OBJECTS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/compiler/bootstrap/libec/Makefile b/compiler/bootstrap/libec/Makefile
index 62c73a1..b1a756f 100644
--- a/compiler/bootstrap/libec/Makefile
+++ b/compiler/bootstrap/libec/Makefile
@@ -189,8 +189,8 @@ clean: objdir
 	$(call rmq,$(TARGET))
 	$(call rmq,$(OBJECTS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index 3cfda1f..08d5be2 100755
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -139,17 +139,20 @@ $(OBJ)ecc.o: $(OBJ)ecc.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index a4ad7c6..ca9c534 100755
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -139,17 +139,20 @@ $(OBJ)ecp.o: $(OBJ)ecp.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index d864db8..714f9ae 100755
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -139,17 +139,20 @@ $(OBJ)ecs.o: $(OBJ)ecs.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index 0220679..3f82b4c 100755
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -1,5 +1,4 @@
-.PHONY: all objdir clean realclean distclean
-.SILENT:
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -349,17 +348,20 @@ $(OBJ)bsl.o: ../bootstrap/bsl.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/Makefile b/deps/Makefile
index 4ef6980..29f0cd3 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,4 +1,4 @@
-.PHONY: freetype jpeg png gif z ffi clean realclean distclean
+.PHONY: freetype jpeg png gif z ffi cleantarget clean realclean distclean
 .SILENT:
 
 # CROSS-PLATFORM MAGIC
@@ -16,6 +16,14 @@ all: gif
 endif
 endif
 
+cleantarget:
+	cd freetype-2.3.12 && $(MAKE) cleantarget
+	cd libpng-1.4.0 && $(MAKE) cleantarget
+	cd zlib && $(MAKE) cleantarget
+	cd jpeg-6b && $(MAKE) cleantarget
+	cd libungif-4.1.1 && $(MAKE) cleantarget
+	cd libffi-3.0.11 && $(MAKE) cleantarget
+
 clean:
 	cd freetype-2.3.12 && $(MAKE) clean
 	cd libpng-1.4.0 && $(MAKE) clean
diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile
index 9825ab4..a6038ae 100755
--- a/deps/freetype-2.3.12/Makefile
+++ b/deps/freetype-2.3.12/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -311,13 +311,15 @@ $(OBJ)type42.o: src/type42/type42.c
 $(OBJ)winfnt.o: src/winfonts/winfnt.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/winfonts/winfnt.c -o $(OBJ)winfnt.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS1))
 	$(call rmq,$(_OBJECTS2))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/jpeg-6b/Makefile b/deps/jpeg-6b/Makefile
index d4f3911..0d5d80a 100755
--- a/deps/jpeg-6b/Makefile
+++ b/deps/jpeg-6b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -329,13 +329,15 @@ $(OBJ)jutils.o: jutils.c
 $(OBJ)transupp.o: transupp.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c transupp.c -o $(OBJ)transupp.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS1))
 	$(call rmq,$(_OBJECTS2))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile
index a8f12b7..6404e4f 100644
--- a/deps/libffi-3.0.11/Makefile
+++ b/deps/libffi-3.0.11/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -124,12 +124,14 @@ $(OBJ)types.o: src/types.c
 $(OBJ)closures.o: src/closures.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c src/closures.c -o $(OBJ)closures.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/libpng-1.4.0/Makefile b/deps/libpng-1.4.0/Makefile
index 51d9157..4300f48 100755
--- a/deps/libpng-1.4.0/Makefile
+++ b/deps/libpng-1.4.0/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -159,12 +159,14 @@ $(OBJ)pngwtran.o: ./pngwtran.c
 $(OBJ)pngwutil.o: ./pngwutil.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c ./pngwutil.c -o $(OBJ)pngwutil.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/libungif-4.1.1/Makefile b/deps/libungif-4.1.1/Makefile
index 1b19240..d7e7fa5 100755
--- a/deps/libungif-4.1.1/Makefile
+++ b/deps/libungif-4.1.1/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -97,12 +97,14 @@ $(OBJ)gif_err.o: lib/gif_err.c
 $(OBJ)gifalloc.o: lib/gifalloc.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c lib/gifalloc.c -o $(OBJ)gifalloc.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/deps/zlib/Makefile b/deps/zlib/Makefile
index 5850faf..f55e3af 100755
--- a/deps/zlib/Makefile
+++ b/deps/zlib/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -142,12 +142,14 @@ $(OBJ)uncompr.o: uncompr.c
 $(OBJ)zutil.o: zutil.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c zutil.c -o $(OBJ)zutil.o
 
-clean: objdir
+cleantarget: objdir
 	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/documentor/Makefile b/documentor/Makefile
index 5638047..07485ba 100755
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -220,17 +220,20 @@ $(OBJ)SettingsDialog.o: $(OBJ)SettingsDialog.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ear/Makefile b/ear/Makefile
index 7638afd..680fddc 100644
--- a/ear/Makefile
+++ b/ear/Makefile
@@ -1,5 +1,5 @@
 .SILENT:
-.PHONY: all nores clean realclean distclean
+.PHONY: all nores cleantarget clean realclean distclean
 
 # CROSS-PLATFORM MAGIC
 
@@ -16,6 +16,10 @@ nores:
 	@$(call echo,Building eAR command line tool...)
 	cd cmd && $(MAKE) nores
 
+cleantarget:
+	cd extract && $(MAKE) cleantarget
+	cd cmd && $(MAKE) cleantarget
+
 clean:
 	cd extract && $(MAKE) clean
 	cd cmd && $(MAKE) clean
diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index 8d3f6b0..51ac0f3 100755
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -152,17 +152,17 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 cleantarget: objdir
 	$(call rmq,$(TARGET))
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 8332a0d..7a0100f 100755
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -233,17 +233,20 @@ $(OBJ)extract.o: $(OBJ)extract.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ecere/Makefile b/ecere/Makefile
index ef9119e..53fa3bd 100755
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean cleantarget realclean distclean nores
+.PHONY: all objdir cleaneceretarget cleantarget clean realclean distclean nores
 
 # CORE VARIABLES
 
@@ -1883,12 +1883,17 @@ $(OBJ)instance.c.o: src/com/instance.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
+cleaneceretarget: objdir
+	$(call rmq,$(TARGET))
+
 cleantarget: objdir
 	$(call rmq,$(TARGET))
+	$(MAKE) -f Makefile.ecereCOM cleantarget
+	$(MAKE) -f Makefile.vanilla cleantarget
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS1))
 	$(call rmq,$(ECOBJECTS2))
 	$(call rmq,$(ECOBJECTS3))
@@ -1907,10 +1912,10 @@ clean: objdir
 	$(MAKE) -f Makefile.ecereCOM clean
 	$(MAKE) -f Makefile.vanilla clean
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 	$(MAKE) -f Makefile.ecereCOM realclean
 	$(MAKE) -f Makefile.vanilla realclean
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index ccb3d04..64fa9c5 100755
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -315,17 +315,20 @@ $(OBJ)instance.c.o: src/com/instance.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index c7ec56b..1aec8a3 100755
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -1487,10 +1487,13 @@ $(OBJ)instance.c.o: src/com/instance.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS1))
 	$(call rmq,$(_OBJECTS2))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS1))
 	$(call rmq,$(ECOBJECTS2))
 	$(call rmq,$(COBJECTS1))
@@ -1502,8 +1505,8 @@ clean: objdir
 	$(call rmq,$(SYMBOLS1))
 	$(call rmq,$(SYMBOLS2))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/eda/Makefile b/eda/Makefile
index 1261135..0530780 100644
--- a/eda/Makefile
+++ b/eda/Makefile
@@ -1,5 +1,5 @@
 .SILENT:
-.PHONY: all cmd clean realclean distclean
+.PHONY: all cmd cleantarget clean realclean distclean
 
 # CROSS-PLATFORM MAGIC
 
@@ -18,6 +18,13 @@ ifdef EDASQLiteCipher
 	cd drivers && cd sqliteCipher && $(MAKE)
 endif
 
+cleantarget:
+	cd libeda && $(MAKE) cleantarget
+	cd drivers && cd sqlite && $(MAKE) cleantarget
+ifdef EDASQLiteCipher
+	cd drivers && cd sqliteCipher && $(MAKE) cleantarget
+endif
+
 clean:
 	cd libeda && $(MAKE) clean
 	cd drivers && cd sqlite && $(MAKE) clean
diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index f634a59..eb53335 100755
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -199,17 +199,20 @@ $(OBJ)EDASQLite.o: $(OBJ)EDASQLite.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index f2ced6f..4e5dfee 100755
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean openssl_debug
+.PHONY: all objdir cleantarget clean realclean distclean openssl_debug
 
 # CORE VARIABLES
 
@@ -224,17 +224,20 @@ openssl_debug:
 	@$(call echo,OPENSSL_BIN_DIR $(OPENSSL_BIN_DIR))
 	@$(call echo,OPENSSL_LIB_DIR $(OPENSSL_LIB_DIR))
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index aa3b4b5..2bf3ec5 100755
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -242,8 +242,8 @@ clean: objdir
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: objdir
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: objdir
 	$(call rmrq,obj/)
diff --git a/epj2make/Makefile b/epj2make/Makefile
index 893bfd8..2f586c1 100755
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -217,17 +217,20 @@ $(OBJ)epj2make.o: $(OBJ)epj2make.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ide/Makefile b/ide/Makefile
index b73274b..7607c80 100755
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all objdir clean realclean distclean
+.PHONY: all objdir cleantarget clean realclean distclean
 
 # CORE VARIABLES
 
@@ -695,17 +695,20 @@ $(OBJ)licensing.o: $(OBJ)licensing.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(TARGET))
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: clean
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean:
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 4e106e9..818f401 100755
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2230,7 +2230,7 @@ private:
 
          sameObjTargetDirs = !fstrcmp(objDirExpNoSpaces, targetDirExpNoSpaces);
 
-         f.Printf(".PHONY: all objdir%s clean realclean distclean\n\n", sameObjTargetDirs ? "" : " targetdir");
+         f.Printf(".PHONY: all objdir%s cleantarget clean realclean distclean\n\n", sameObjTargetDirs ? "" : " targetdir");
 
          f.Puts("# CORE VARIABLES\n\n");
 
@@ -2749,11 +2749,15 @@ private:
          if(numCObjects)
             GenMakefilePrintMainObjectRule(f, config);
 
-         f.Printf("clean: objdir%s\n", sameObjTargetDirs ? "" : " targetdir");
-         f.Printf("\t$(call rmq,%s$(TARGET))\n", numCObjects ? "$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) " : "");
+         f.Printf("cleantarget: objdir%s\n", sameObjTargetDirs ? "" : " targetdir");
+         f.Puts("\t$(call rmq,$(TARGET))\n");
+         f.Puts("\n");
+
+         f.Puts("clean: cleantarget\n");
          OutputCleanActions(f, "_OBJECTS", objectsParts);
          if(numCObjects)
          {
+            f.Printf("\t$(call rmq,%s)\n", "$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S)");
             OutputCleanActions(f, "ECOBJECTS", eCsourcesParts);
             OutputCleanActions(f, "COBJECTS", eCsourcesParts);
             OutputCleanActions(f, "BOWLS", eCsourcesParts);
@@ -2762,13 +2766,15 @@ private:
          }
          f.Puts("\n");
 
-         f.Puts("realclean: clean\n");
+         f.Puts("realclean: cleantarget\n");
          f.Puts("\t$(call rmrq,$(OBJ))\n");
          if(!sameObjTargetDirs)
             f.Printf("\t$(call rmdirq,%s)\n", targetDirExpNoSpaces);
          f.Puts("\n");
 
-         f.Puts("distclean:\n");
+         f.Puts("distclean: cleantarget\n");
+         if(!sameObjTargetDirs)
+            f.Printf("\t$(call rmdirq,%s)\n", targetDirExpNoSpaces);
          f.Puts("\t$(call rmrq,obj/)\n");
 
          delete f;
-- 
1.8.3.1