Merge branch 'master' of https://github.com/HerculesWS/Hercules

7 files changed, 66 insertions, 29 deletions

diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 02759b32e..4bb7f3fb8 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -34,21 +34,27 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all sql char-server clean help
+.PHONY: all sql char-server clean buildclean help
 
 all: sql
 
 sql: char-server
 
-clean:
+buildclean:
+	@echo "	CLEAN	char (build temp files)"
+	@rm -rf *.o obj_sql
+
+clean: buildclean
 	@echo "	CLEAN	char"
-	@rm -rf *.o obj_sql ../../char-server@EXEEXT@
+	@rm -rf ../../char-server@EXEEXT@
 
 help:
 	@echo "possible targets are 'char-server' 'all' 'clean' 'help'"
 	@echo "'char-server' - char server"
 	@echo "'all'         - builds all above targets"
 	@echo "'clean'       - cleans builds and objects"
+	@echo "'buildclean'  - cleans build temporary (object) files, without deleting the"
+	@echo "                executables"
 	@echo "'help'        - outputs this message"
 
 #####################################################################
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 78f9cd0d1..53b7a472e 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -40,22 +40,25 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all sql common common_sql common_mini clean help
+.PHONY: all sql common common_sql common_mini clean buildclean help
 
 all: sql
 
 sql: $(SQL_DEPENDS)
 
-clean:
-	@echo "	CLEAN	common"
+buildclean:
+	@echo "	CLEAN	common (build temp files)"
 	@rm -rf *.o obj_all obj_sql
 
+clean: buildclean
+	@echo "	CLEAN	common"
+
 help:
 	@echo "possible targets are 'sql' 'all' 'clean' 'help'"
-	@echo "'sql'    - builds object files used in sql servers"
-	@echo "'all'    - builds all above targets"
-	@echo "'clean'  - cleans builds and objects"
-	@echo "'help'   - outputs this message"
+	@echo "'sql'                 - builds object files used in sql servers"
+	@echo "'all'                 - builds all above targets"
+	@echo "'clean', 'buildclean' - cleans builds and objects"
+	@echo "'help'                - outputs this message"
 
 #####################################################################
 
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index b6b70a495..a97d17f68 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -31,21 +31,27 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all sql login-server clean help
+.PHONY: all sql login-server clean buildclean help
 
 all: sql
 
 sql: login-server
 
-clean:
+buildclean:
+	@echo "	CLEAN	login (build temp files)"
+	@rm -rf *.o obj_sql
+
+clean: buildclean
 	@echo "	CLEAN	login"
-	@rm -rf *.o obj_sql ../../login-server@EXEEXT@
+	@rm -rf ../../login-server@EXEEXT@
 
 help:
 	@echo "possible targets are 'login-server' 'all' 'clean' 'help'"
 	@echo "'login-server' - login server"
 	@echo "'all'          - builds all above targets"
 	@echo "'clean'        - cleans builds and objects"
+	@echo "'buildclean'   - cleans build temporary (object) files, without deleting the"
+	@echo "                 executables"
 	@echo "'help'         - outputs this message"
 
 #####################################################################
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index fb78d51a1..b516c61ca 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -47,21 +47,27 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all sql map-server clean help
+.PHONY: all sql map-server clean buildclean help
 
 all: sql
 
 sql: map-server
 
-clean:
+buildclean:
+	@echo "	CLEAN	map (build temp files)"
+	@rm -rf *.o obj_sql
+
+clean: buildclean
 	@echo "	CLEAN	map"
-	@rm -rf *.o obj_sql ../../map-server@EXEEXT@
+	@rm -rf ../../map-server@EXEEXT@
 
 help:
 	@echo "possible targets are 'map-server' 'all' 'clean' 'help'"
 	@echo "'map-server' - map server"
 	@echo "'all'        - builds all above targets"
 	@echo "'clean'      - cleans builds and objects"
+	@echo "'buildclean' - cleans build temporary (object) files, without deleting the"
+	@echo "               executables"
 	@echo "'help'       - outputs this message"
 
 #####################################################################
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index ed573238d..53f44a0b4 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -44,8 +44,14 @@ clean: buildclean
 
 help:
 	@echo "possible targets are $(PLUGINS:%='%') 'all' 'clean' 'help'"
-	@echo "'sample'   - sample plugin"
-	@echo "'help'     - outputs this message"
+	@echo ""
+	@echo "$(PLUGINS:%='%')"
+	@echo "              - builds a specific plugin"
+	@echo "'all'         - builds all above targets"
+	@echo "'clean'       - cleans builds and objects"
+	@echo "'buildclean'  - cleans build temporary (object) files, without deleting the"
+	@echo "                compiled plugins"
+	@echo "'help'        - outputs this message"
 
 #####################################################################
 
@@ -56,4 +62,4 @@ Makefile: Makefile.in
 
 ../../plugins/%@DLLEXT@: %.c $(ALL_H) $$(shell ls %/* 2>/dev/null)
 	@echo "	CC	$<"
-	@$(CC) @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $<
\ No newline at end of file
+	@$(CC) @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $<
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index cb99e7004..0c6d15c6b 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -24,13 +24,17 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all test_spinlock
+.PHONY: all test_spinlock clean buildclean
 
 all: test_spinlock Makefile
 
-clean:
+buildclean:
+	@echo "	CLEAN	test (build temp files)"
+	@rm -rf *.o obj
+
+clean: buildclean
 	@echo "	CLEAN	test"
-	@rm -rf *.o obj ../../test_spinlock@EXEEXT@ 
+	@rm -rf ../../test_spinlock@EXEEXT@
 
 #####################################################################
 
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index baf4a0327..ee448a16a 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -22,7 +22,7 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all mapcache clean help
+.PHONY: all mapcache clean buildclean help
 
 all: mapcache Makefile
 
@@ -32,16 +32,22 @@ mapcache: ../../mapcache@EXEEXT@
 	@echo "	LD	$(notdir $@)"
 	@$(CC) @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@
 
-clean:
+buildclean:
+	@echo "	CLEAN	tool (build temp files)"
+	@rm -rf obj_all/*.o
+
+clean: buildclean
 	@echo "	CLEAN	tool"
-	@rm -rf obj_all/*.o ../../mapcache@EXEEXT@
+	@rm -rf ../../mapcache@EXEEXT@
 
 help:
 	@echo "possible targets are 'mapcache' 'all' 'clean' 'help'"
-	@echo "'mapcache'  - mapcache generator"
-	@echo "'all'       - builds all above targets"
-	@echo "'clean'     - cleans builds and objects"
-	@echo "'help'      - outputs this message"
+	@echo "'mapcache'   - mapcache generator"
+	@echo "'all'        - builds all above targets"
+	@echo "'clean'      - cleans builds and objects"
+	@echo "'buildclean' - cleans build temporary (object) files, without deleting the"
+	@echo "               executables"
+	@echo "'help'       - outputs this message"
 
 #####################################################################