Added global list of file patterns for "make distclean". Some "make clean"

and "make distclean" cleanup and additions.
Henning Meier-Geinitz <henning@meier-geinitz.de>

Makefile.in

@@ -29,6 +29,8 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 SUBDIRS	= include lib sanei backend frontend doc tools po
@@ -89,9 +91,12 @@ libcheck:
 clean: clean-recursive
 
 distclean: clean distclean-recursive
-	rm -f *~ *.log *.bak libtool
-	rm -f Makefile config.cache config.status
+	rm -f $(DISTCLEAN_FILES)
+	rm -f Makefile config.cache config.status libtool *.tar.gz 
+	rm -f sane-backends-*.lsm
 	rm -f japi/Makefile testsuite/Makefile
+	rm -f $(addprefix japi/,$(DISTCLEAN_FILES))
+	rm -f $(addprefix testsuite/,$(DISTCLEAN_FILES))
 	rm -rf $(distdir)
 
 depend: depend-recursive

backend/Makefile.in

@@ -55,6 +55,8 @@ MINST	= --mode=install
 
 COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS)
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 PRELOADABLE_BACKENDS = abaton agfafocus apple artec as6e avision bh canon \
@@ -356,11 +358,12 @@ depend:
 	makedepend $(INCLUDES) *.c
 
 clean:
-	rm -f *.lo *.o *~ *.la libsane.la *.bak dll-preload.c
+	rm -f *.lo *.o *.la libsane.la dll-preload.c
 	find . -type l -name \*-s.c | xargs rm -f
 	rm -rf .libs
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f Makefile libsane.so
 
 dist: $(DISTFILES)

configure.in

@@ -59,7 +59,7 @@ if test "${ac_cv_prog_gcc}" = "yes"; then
       -Wstrict-prototypes \
       -pedantic"
 
-  dnl OS/2 and others don't include some headers with -ansi enabled
+  # OS/2 and others don't include some headers with -ansi enabled
   ANSI_FLAG=-ansi
   AC_CHECK_HEADER(os2.h,[ANSI_FLAG=],)
   case "${host_os}" in  
@@ -368,6 +368,9 @@ AC_SUBST(V_MINOR)
 AC_SUBST(V_REV)
 AC_SUBST(DLL_PRELOAD)
 
+DISTCLEAN_FILES="*~ .*~ *.log *.bak *.old *.orig *.out *.rej \#* .\#*"
+AC_SUBST(DISTCLEAN_FILES)
+
 AC_OUTPUT([Makefile lib/Makefile sanei/Makefile frontend/Makefile
 	   japi/Makefile backend/Makefile include/Makefile doc/Makefile
 	   po/Makefile testsuite/Makefile

doc/Makefile.in

@@ -32,6 +32,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S = @LN_S@
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 SECT1	= saned.1 scanimage.1 sane-find-scanner.1
@@ -197,8 +199,9 @@ clean:
 	rm -f *.ilg
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f $(MANPAGES)
-	rm -f Makefile *~
+	rm -f Makefile
 	rm -f *.lot *.lof *.ind *.gz
 	rm -f sane.dvi sane.ps sane-backends.html
 	rm -f sane/*.html sane/*.gif

frontend/Makefile.in

@@ -47,6 +47,8 @@ SANED	= @SANED@
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 BINPROGS = scanimage
@@ -98,10 +100,11 @@ scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB)
 	@$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBSANE) $(LIBLIB) $(LIBS)
 
 clean:
-	rm -f *.o *~ .*~ *.bak
+	rm -f *.o
 	rm -rf .libs
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f Makefile $(PROGRAMS) $(TESTPROGRAMS)
 
 depend:

include/Makefile.in

@@ -30,6 +30,8 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 INSTALLED_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,sane.h \
@@ -55,8 +57,10 @@ all:
 clean:
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
+	rm -f $(addprefix sane/,$(DISTCLEAN_FILES))
 	rm -f Makefile
-	rm -f *~ sane/*~ sane/config.h
+	rm -f sane/config.h
 
 install:
 	$(MKDIR) $(includedir)/sane

japi/Makefile.in

@@ -58,6 +58,8 @@ MINST	= --mode=install
 
 COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS)
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 LIBSANE = -L`pwd`/../backend/libs -lsane
@@ -98,14 +100,14 @@ libsanej.la: Sane.lo
 Sane.lo: Sane.h
 
 clean:
-	rm -f *.class *.lo *.o *~ *.la *.bak
+	rm -f *.class *.lo *.o *.la
 	rm -f Sane.h
 	rm -rf .libs
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 
 #	Install library.  Don't know where to install .class files yet.
-
 install:
 	$(MKDIR) $(libdir) $(configdir)
 	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsanej.la \

lib/Makefile.in

@@ -44,6 +44,8 @@ LIBTOOL = ../libtool
 MCOMP	= --mode=compile
 MLINK	= --mode=link
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 
@@ -81,10 +83,11 @@ depend:
 	makedepend -I. -I../include *.c
 
 clean:
-	rm -f *.out *.o *.lo *~ *.a *.bak $(TESTPROGRAMS)
+	rm -f *.o *.lo *.a $(TESTPROGRAMS)
 	rm -rf .libs
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f Makefile
 
 dist: $(DISTFILES)

po/Makefile.in

@@ -49,6 +49,8 @@ ALL_POTS = $(addsuffix .pot,$(ALL_BACKENDS))
 ALL_MOS = $(filter-out saneopts.%.mo,$(addsuffix .mo,$(basename $(ALL_POS))))
 ALL_LINGUAS = $(sort $(subst .,,$(suffix $(basename $(ALL_POS)))))
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 DISTFILES = Makefile.in README epson.de.po mustek.de.po \
   mustek_usb.de.po plustek.de.po pnm.de.po saneopts.de.po saneopts.fr.po \
   umax.de.po umax.fr.po snapscan.de.po
@@ -122,9 +124,9 @@ clean:
 	rm -f *.old
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f Makefile
 	rm -f *.pot
-	rm -f *~
 	rm -rf $(TMP_FILE_DIR)
 
 depend:

sanei/Makefile.in

@@ -43,6 +43,8 @@ LIBTOOL = ../libtool
 MCOMP	= --mode=compile
 MLINK	= --mode=link
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 LIBSANEI_OBJS = sanei_ab306.o sanei_constrain_value.o sanei_init_debug.o \
@@ -100,10 +102,11 @@ depend:
 	makedepend -I. -I../include *.c
 
 clean:
-	rm -f *.out *.o *.lo *~ *.a *.bak $(OBJS) $(TESTPROGRAMS)
+	rm -f *.o *.lo *.a $(OBJS) $(TESTPROGRAMS)
 	rm -rf .libs
 
 distclean: clean
+	rm -f $(DISTCLEAN_FILES)
 	rm -f Makefile
 
 dist: $(DISTFILES)

testsuite/Makefile.in

@@ -38,9 +38,11 @@ TESTFILE  = testfile.pnm
 DEVICE    = pnm:0
 OPTIONS   = --filename=$(TESTFILE)
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 DISTFILES = Makefile.in README testfile.pnm 
 
-.PHONY: all dist test test.local 
+.PHONY: all clean dist distclean test test.local 
 
 all: Makefile
 	@echo "Use 'make test' to run the tests."
@@ -65,6 +67,12 @@ Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=testsuite/Makefile CONFIG_HEADERS= /bin/sh ./config.status
 
+clean:
+
+distclean: clean
+	rm -f $(DISTCLEAN_FILES)
+	rm -f Makefile
+
 dist: $(DISTFILES)
 	for file in $(DISTFILES); do \
 	  ln $$file $(distdir)/testsuite 2> /dev/null \

tools/Makefile.in

@@ -49,6 +49,8 @@ MINST	= --mode=install
 COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) $(CPPFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
 
+DISTCLEAN_FILES = @DISTCLEAN_FILES@
+
 @SET_MAKE@
 
 DESTINATIONS = sane-find-scanner sane-config umax_pp
@@ -102,12 +104,13 @@ depend:
 	makedepend $(INCLUDES) *.c
 
 clean:
-	rm -f *.lo *.o *~ *.la *.bak 
+	rm -f *.lo *.o *.la
 	find . -type l -name \*-s.c | xargs rm -f
 	rm -rf .libs
 
 distclean: clean
 	rm -f Makefile $(DESTINATIONS) mustek600iin-off
+	rm -f $(DISTCLEAN_FILES)
 
 dist: $(DISTFILES)
 	for file in $(DISTFILES); do \