To fix the perpetually broken makefiles in the contrib tree, I have

written a generic framework of rules that the contrib makefiles can
use instead of writing their own each time.  You only need to set a few
variables and off you go.

1 files changed, 7 insertions, 61 deletions

diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index f341631dab..03aa1479be 100644
--- a/contrib/btree_gist/Makefile
+++ b/contrib/btree_gist/Makefile
@@ -1,66 +1,12 @@
+# $Header: /cvsroot/pgsql/contrib/btree_gist/Makefile,v 1.3 2001/09/06 10:49:29 petere Exp $
+
 subdir = contrib/btree_gist
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-# override libdir to install shlib in contrib not main directory
-libdir := $(libdir)/contrib
-
-# shared library parameters
-NAME= btree_gist
-SO_MAJOR_VERSION= 1
-SO_MINOR_VERSION= 0
-
-override CPPFLAGS += -I$(srcdir)
-
-OBJS= btree_gist.o
-
-all: all-lib $(NAME).sql
-
-# Shared library stuff
-include $(top_srcdir)/src/Makefile.shlib
-
-
-$(NAME).sql: $(NAME).sql.in
-	sed -e 's:MODULE_PATHNAME:$(libdir)/$(shlib):g' < $< > $@
-
-.PHONY: submake
-submake:
-	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress
-
-# against installed postmaster
-installcheck: submake
-	$(top_builddir)/src/test/regress/pg_regress btree_gist
-
-# in-tree test doesn't work yet (no way to install my shared library)
-#check: all submake
-#	$(top_builddir)/src/test/regress/pg_regress --temp-install \
-#	  --top-builddir=$(top_builddir) btree_gist
-check:
-	@echo "'make check' is not supported."
-	@echo "Do 'make install', then 'make installcheck' instead."
-
-install: all installdirs install-lib
-	$(INSTALL_DATA) $(srcdir)/README.$(NAME)  $(docdir)/contrib
-	$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
-
-installdirs:
-	$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)
-
-uninstall: uninstall-lib
-	rm -f $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql
-
-clean distclean maintainer-clean: clean-lib
-	rm -f *.so y.tab.c y.tab.h $(OBJS) $(NAME).sql
-# things created by various check targets
-	rm -rf results tmp_check log
-	rm -f regression.diffs regression.out regress.out run_check.out
-ifeq ($(PORTNAME), win)
-	rm -f regress.def
-endif
-
-depend dep:
-	$(CC) -MM $(CFLAGS) *.c >depend
+MODULES = btree_gist
+DATA_built = btree_gist.sql
+DOCS = README.btree_gist
+REGRESS = btree_gist
 
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+include $(top_srcdir)/contrib/contrib-global.mk