# BUILD : 1.7.13 (1015) # BUGS : # NOTES : Fixed distclean.

git-svn-id: svn://svn.anope.org/anope/trunk@1015 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@740 5417fbe8-f217-4b02-8779-1006273d7864

11 files changed, 37 insertions, 33 deletions

diff --git a/Changes b/Changes
index ce5c3a2b8..ef5c02beb 100644
--- a/Changes
+++ b/Changes
@@ -53,6 +53,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2006
 03/18 A New icon file for anope win32.                                    [#472]
 03/14 A Anope will now terminate on Win98. Added version check.           [#473]
 03/01 A Clarity on module loading status numbers.                         [#435]
+03/22 F Fixed distclean in all Makefiles.                                 [#481]
 03/19 F Fixed some gcc4 compiling issues.                                 [#453]
 03/18 F Fixed closing of file pointer in langtool.c.                      [#478]
 03/14 F Fixed gcc switches for modules.                                   [#474]
diff --git a/Makefile.in b/Makefile.in
index 74368dc0e..e74b1ad77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,12 +109,11 @@ clean:
 	(cd src/tools ; ${MAKE} ${MAKEARGS} clean )
 
 distclean: clean
-	(cd lang ; ${MAKE} ${MAKEARGS} distclean )
-	(cd include ; ${MAKE} ${MAKEARGS} distclean )
-	(cd src ; ${MAKE} ${MAKEARGS} distclean )
-	(cd src/tools ; ${MAKE} ${MAKEARGS} distclean )
-	rm -f config.log config.status config.cache Makefile
-	rm -f src/bin/anoperc
+	(cd lang ; ${MAKE} distclean )
+	(cd include ; ${MAKE} distclean )
+	(cd src ; ${MAKE} distclean )
+	(cd src/tools ; ${MAKE} distclean )
+	rm -f config.log config.status config.cache Makefile src/bin/anoperc
 
 install: DUMMY
 	(cd src ; ${MAKE} ${MAKEARGS} install)
diff --git a/src/Makefile b/src/Makefile
index 9e55769b5..e9b2e1469 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 
 all: services
 
-distclean: clean spotless
+distclean: spotless
 distclean_modules: clean_modules spotless
 
 services:  $(OBJS)
@@ -88,20 +88,20 @@ clean: clean_modules clean_protocols clean_core
 	rm -f *.o services a.out
 clean_modules:
 	@touch modules/Makefile.inc # Horribly ugly...
-	(cd modules ; ${MAKE} ${MAKEARGS} clean)
+	(cd modules ; ${MAKE} clean)
 
 clean_protocols:
 	@touch protocol/Makefile.inc
-	(cd protocol ; ${MAKE} ${MAKEARGS} clean)
+	(cd protocol ; ${MAKE} clean)
 
 clean_core:
 	@touch core/Makefile.inc
-	(cd core ; ${MAKE} ${MAKEARGS} clean)
+	(cd core ; ${MAKE} clean)
 
-spotless: clean
-	(cd modules ; ${MAKE} ${MAKEARGS} distclean)
-	(cd protocol ; ${MAKE} ${MAKEARGS} distclean)
-	(cd core ; ${MAKE} ${MAKEARGS} distclean)
+spotless:
+	(cd modules ; ${MAKE} distclean)
+	(cd protocol ; ${MAKE} distclean)
+	(cd core ; ${MAKE} distclean)
 
 install: services
 	test -d ${BINDEST} || mkdir ${BINDEST}
diff --git a/src/core/Makefile b/src/core/Makefile
index 254e8d0d3..ca762fbff 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -18,7 +18,7 @@ modules: $(OBJECTS) $(SO_FILES)
 install: 
 	$(CP) ./*.so $(MODULE_PATH) 
 
-distclean: clean spotless
+distclean: spotless
 
 .c.o:
 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
@@ -34,11 +34,11 @@ subs:
 subs_clean:
 	@for i in $(SUBS); do \
 	echo "cleaning in $$i..."; \
-	(cd $$i; $(MAKE) $(MAKEARGS) clean); done
+	(cd $$i; $(MAKE) clean); done
 
 clean: subs_clean
 	rm -f *.o *.so *.c~ core
 
-spotless: clean
-	rm -f *.so Makefile.inc
+spotless: subs_clean
+	rm -f *.o *.so *.c~ core Makefile.inc
 
diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
index 21dfab3d7..9fbadf3b0 100644
--- a/src/core/Makefile.sub
+++ b/src/core/Makefile.sub
@@ -13,7 +13,7 @@ all: module
 
 module: $(OBJECTS) so
 
-distclean: clean spotless
+distclean: spotless
 
 .c.o:
 	$(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
@@ -25,5 +25,5 @@ clean:
 	rm -f *.o *.so *.c~ core
 
 spotless: clean
-	rm -f *~ 
+	rm -f *~ *.o *.so *.c~ core
 
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 254e8d0d3..4a261d96f 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -18,7 +18,7 @@ modules: $(OBJECTS) $(SO_FILES)
 install: 
 	$(CP) ./*.so $(MODULE_PATH) 
 
-distclean: clean spotless
+distclean: spotless
 
 .c.o:
 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
@@ -39,6 +39,6 @@ subs_clean:
 clean: subs_clean
 	rm -f *.o *.so *.c~ core
 
-spotless: clean
-	rm -f *.so Makefile.inc
+spotless:
+	rm -f *.o *.so *.c~ core *.so Makefile.inc
 
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index 300b13116..5e53fa5dd 100644
--- a/src/modules/Makefile.sub
+++ b/src/modules/Makefile.sub
@@ -13,7 +13,7 @@ all: module
 
 module: $(OBJECTS) so
 
-distclean: clean spotless
+distclean: spotless
 
 .c.o:
 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
@@ -24,6 +24,6 @@ so:
 clean:
 	rm -f *.o *.so *.c~ core
 
-spotless: clean
-	rm -f *~ 
+spotless:
+	rm -f *~ *.o *.so *.c~ core
 
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 254e8d0d3..a30aee45d 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -34,11 +34,11 @@ subs:
 subs_clean:
 	@for i in $(SUBS); do \
 	echo "cleaning in $$i..."; \
-	(cd $$i; $(MAKE) $(MAKEARGS) clean); done
+	(cd $$i; $(MAKE) clean); done
 
 clean: subs_clean
 	rm -f *.o *.so *.c~ core
 
-spotless: clean
-	rm -f *.so Makefile.inc
+spotless: subs_clean
+	rm -f *.o *.so *.c~ core *.so Makefile.inc
 
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
index 300b13116..a2d6a414a 100644
--- a/src/protocol/Makefile.sub
+++ b/src/protocol/Makefile.sub
@@ -13,7 +13,7 @@ all: module
 
 module: $(OBJECTS) so
 
-distclean: clean spotless
+distclean: spotless
 
 .c.o:
 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
@@ -25,5 +25,5 @@ clean:
 	rm -f *.o *.so *.c~ core
 
 spotless: clean
-	rm -f *~ 
+	rm -f *~ *.o *.so *.c~ core
 
diff --git a/src/tools/Makefile b/src/tools/Makefile
index d28b68981..f64c6fa65 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -14,7 +14,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 
 all: ${OBJS}
 
-distclean: clean spotless
+distclean: spotless
 
 anopesmpt:  $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
diff --git a/version.log b/version.log
index 4efc073e7..222a4d947 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="13"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1014"
+VERSION_BUILD="1015"
 
 # $Log$
 #
+# BUILD : 1.7.13 (1015)
+# BUGS  : 
+# NOTES : Fixed distclean.
+#
 # BUILD : 1.7.13 (1014)
 # BUGS  : 
 # NOTES : de.l updated, thx to monk.