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/cube/Makefile b/contrib/cube/Makefile
index dd851355c40..16228437020 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,28 +1,15 @@
-#
-# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.4 2001/06/18 21:38:01 momjian Exp $
-#
+# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.5 2001/09/06 10:49:29 petere Exp $
 
 subdir = contrib/cube
 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= cube
-SO_MAJOR_VERSION= 1
-SO_MINOR_VERSION= 0
-
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
-override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
-
+MODULE_big = cube
 OBJS= cube.o cubeparse.o cubescan.o buffer.o
 
-all: all-lib $(NAME).sql
-
-# Shared library stuff
-include $(top_srcdir)/src/Makefile.shlib
+DATA_built = cube.sql
+DOCS = README.cube
+REGRESS = cube
 
 
 cubeparse.c cubeparse.h: cubeparse.y
@@ -41,48 +28,7 @@ else
 	@$(missing) flex $< $@
 endif
 
-$(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 cube
-
-# 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) seg
-check:
-	@echo "'make check' is not supported."
-	@echo "Do 'make install', then 'make installcheck' instead."
+EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
 
-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 cubeparse.c cubeparse.h cubescan.c
-	rm -f 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
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
+include $(top_srcdir)/contrib/contrib-global.mk