Fix make distclean

Author: kerneis

Makefile.in

@@ -256,6 +256,8 @@ pdfdoc: doc/cilpp.tex
 
 .PHONY: distclean cleandoc cleancilly clean
 distclean: clean
+	$(MAKE) -C test distclean
+	rm -rf autom4te.cache/
 	rm -f Makefile
 	rm -f $(CILLYDIR)/App/Cilly/CilConfig.pm
 	rm -f config.h
@@ -276,6 +278,9 @@ clean: $(CILLYDIR)/Makefile
 	rm -rf $(OBJDIR)
 	rm -f $(BINDIR)/$(CILLY).*
 	rm -rf doc/html/
+	rm -rf doc/cilcode.tmp/
+	rm -f doc/cil.version.*
+	rm -f doc/cilpp.*
 	$(MAKE) -C $(CILLYDIR) clean
 	rm -f $(CILLYDIR)/App/Cilly.pm
 	rm -f $(CILLYDIR)/Makefile.old

test/Makefile

@@ -26,18 +26,25 @@ clean:
 		-name '*.a' -o \
 		-name '*.stackdump' -o \
 		-name '*.exe' -o \
-		-name '*.i' -o \
+		\( -name '*.i' -a -not -name 'lineno.i' -a -not -name 'empty.i' \) -o \
+		-name '*.cmi' -o \
+		-name '*.cmo' -o \
+		-name '*.err' -o \
+		-name '*.out' -o \
 		-name '*_ppp.c' -o \
 		-name '*.origi' -o \
 		-name '*.o' -o \
 		-name '*.obj' -o \
 		-name '*.cabs.c' -o \
 	        -name "*-tmp.c" -o \
 		-name '*_comb*.c' -o \
-		-name 'libmerge.a*' \
+		-name 'libmerge.a*' -o \
+		-name 'merge-ar' \
 	\) -exec rm -f {} \;
 	-find . -name '*.browser' -exec rm -rf {} \;
 
+distclean: clean
+	rm -f cil.log*
 
 CILHOME := $(CURDIR)/..
 CILLY := $(CILHOME)/bin/cilly