opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adjust src/tutorial Makefile so that it can use pgxs. This allows the 

tutorial to be used without necessarily having a configured source tree.
This commit is contained in:
Tom Lane 2005-01-13 18:23:22 +00:00
parent c06b31dc31
commit 3810c23fe4
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -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

34
src/tutorial/Makefile
View File

@ -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 $
#
#-------------------------------------------------------------------------
MODULES = complex funcs
DATA_built = advanced.sql basics.sql complex.sql funcs.sql syscat.sql
SHLIB_LINK = $(BE_DLLLIBS)
ifdef NO_PGXS
subdir = src/tutorial
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
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)
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)