From: "Michael J. Maravillo" <mmj@philonline.com>

This patch makes it possible to do a "real" make distclean (back to its
fresh state) on the distribution after compilation, regression testing,
etc.

diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 4a0721439b4616acfb577a637e3908e1bd2bab81..d0c4af56bc9c18fad21d9833779a6ae6a81b37b4 100644 (file)
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -33,4 +33,4 @@ $(CONTRIBDIR):
            -e "s:_DLSUFFIX_:$(DLSUFFIX):g" < $< > $@
 
 clean: 
-       rm -f $(TARGETS)
+       rm -f $(TARGETS) *.o

diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index aa8f91319616bf7c89ebde4ca5728cc68d1383d9..c421142ebbbdb7070e4c5411d75d2cdc53fb8d4d 100644 (file)
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.23 1998/01/13 04:43:22 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.24 1998/01/17 23:39:05 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -62,6 +62,7 @@ clean:
        $(MAKE) -C interfaces clean
        $(MAKE) -C bin clean
        $(MAKE) -C test clean
+       $(MAKE) -C ../contrib/spi clean
 ifneq ($(wildcard man), )
        $(MAKE) -C man clean
 endif
@@ -78,6 +79,9 @@ distclean: clean
                bin/pg_dump/Makefile \
                bin/pg_version/Makefile \
                include/config.h \
+               include/dynloader.h \
+               backend/port/tas.s \
+               backend/port/dynloader.c \
                backend/utils/Gen_fmgrtab.sh \
                interfaces/libpq/Makefile \
                interfaces/libpgtcl/Makefile \

diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 44eb0bf6aedd28197c19e1726ae56893847dae28..dd9c774a1180f6116ee42cdd70b9e5a54376686f 100644 (file)
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.3 1998/01/17 23:33:39 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.4 1998/01/17 23:39:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -166,7 +166,7 @@ depend dep:
 
 .PHONY: clean
 clean:
-       rm -f libpq.a $(shlib) $(OBJS) c.h
+       rm -f libpq.a $(shlib) $(OBJS) c.h dllist.c pqcomprim.c libpq.so
 
 ifeq (depend,$(wildcard depend))
 include depend

diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 93f18a11b5c75bc3b416326568e77856753c2fa9..90080e298b8dc48a2ea8ed02c03e5b1fee9c0476 100644 (file)
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.13 1998/01/01 05:37:29 thomas Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.14 1998/01/17 23:39:22 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -54,7 +54,7 @@ runtest: $(INFILES)
        @echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
 
 clean:
-       rm -f $(INFILES)
+       rm -f $(INFILES) regress.out
        $(MAKE) -C sql clean
        $(MAKE) -C expected clean
        $(MAKE) -C results clean

diff --git a/src/test/regress/expected/Makefile b/src/test/regress/expected/Makefile
index c398e189476023dd0ade60718bd2d79de94ac32d..b0f75b2bd4f9255d9ec237bcc666238600303e16 100644 (file)
--- a/src/test/regress/expected/Makefile
+++ b/src/test/regress/expected/Makefile
@@ -7,11 +7,11 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.2 1997/08/28 04:49:17 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.3 1998/01/17 23:39:35 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-CLFILES=       create_function_1.out create_function_2.out copy.out constraints.out
+CLFILES=       create_function_1.out create_function_2.out copy.out constraints.out misc.out
 
 clean:
        rm -f $(CLFILES)