diff options
| author | Tom Lane | 2005-01-13 18:23:22 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-01-13 18:23:22 +0000 |
| commit | 3810c23fe496b4dfdfc52efafcffb82d9a8d3714 (patch) | |
| tree | 8058bd96ac5bd0075ef7b2fd023eb6ae20a795bc | |
| parent | c06b31dc31e5f6a8ee669449157b39be9987e375 (diff) | |
Adjust src/tutorial Makefile so that it can use pgxs. This allows the
tutorial to be used without necessarily having a configured source tree.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/tutorial/Makefile | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/Makefile b/src/Makefile index 2b0bea0ff8..0963f88a8f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/Makefile,v 1.35 2004/10/06 08:49:59 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile,v 1.36 2005/01/13 18:23:21 tgl Exp $ # #------------------------------------------------------------------------- @@ -53,7 +53,7 @@ clean: $(MAKE) -C pl $@ $(MAKE) -C makefiles $@ $(MAKE) -C test $@ - $(MAKE) -C tutorial $@ + $(MAKE) -C tutorial NO_PGXS=1 $@ $(MAKE) -C utils $@ $(MAKE) -C tools/thread $@ @@ -67,7 +67,7 @@ distclean maintainer-clean: -$(MAKE) -C pl $@ -$(MAKE) -C makefiles $@ -$(MAKE) -C test $@ - -$(MAKE) -C tutorial $@ + -$(MAKE) -C tutorial NO_PGXS=1 $@ -$(MAKE) -C utils $@ -$(MAKE) -C tools/thread $@ rm -f Makefile.port Makefile.global diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile index 7c68cd7ac6..50c3a7404a 100644 --- a/src/tutorial/Makefile +++ b/src/tutorial/Makefile @@ -3,32 +3,32 @@ # Makefile-- # Makefile for tutorial # +# By default, this builds against an existing PostgreSQL installation +# (the one identified by whichever pg_config is first in your path). +# Within a configured source tree, you can say "gmake NO_PGXS=1 all" +# to build using the surrounding source tree. +# # IDENTIFICATION -# $PostgreSQL: pgsql/src/tutorial/Makefile,v 1.17 2003/11/29 19:52:14 pgsql Exp $ +# $PostgreSQL: pgsql/src/tutorial/Makefile,v 1.18 2005/01/13 18:23:22 tgl Exp $ # #------------------------------------------------------------------------- -subdir = src/tutorial -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global +MODULES = complex funcs +DATA_built = advanced.sql basics.sql complex.sql funcs.sql syscat.sql -override CFLAGS+= $(CFLAGS_SL) SHLIB_LINK = $(BE_DLLLIBS) -# -# DLOBJS are the dynamically-loaded object files. The "funcs" queries -# include CREATE FUNCTIONs that load routines from these files. -# -DLOBJS= complex$(DLSUFFIX) funcs$(DLSUFFIX) - -QUERIES= advanced.sql basics.sql complex.sql funcs.sql syscat.sql - -all: $(DLOBJS) $(QUERIES) +ifdef NO_PGXS +subdir = src/tutorial +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global +include $(top_srcdir)/src/makefiles/pgxs.mk +else +PGXS = $(shell pg_config --pgxs) +include $(PGXS) +endif %.sql: %.source rm -f $@; \ C=`pwd`; \ sed -e "s:_OBJWD_:$$C:g" < $< > $@ - -clean distclean maintainer-clean: - rm -f $(DLOBJS) $(QUERIES) |