Moved configure script from src/ to the top level directory. Moved

configuration helper things into config/ dir. Adjusted some relative paths
in makefiles.
This commit is contained in:
Peter Eisentraut 2000-06-06 22:01:15 +00:00
parent 42ad25fcd1
commit 5b9d0d9a5c
16 changed files with 601 additions and 580 deletions

30
GNUmakefile.in Normal file
View File

@ -0,0 +1,30 @@
#
# PostgreSQL top level makefile
#
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.1 2000/06/06 22:00:45 petere Exp $
#
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = .
all:
make -C src all
@echo "All of PostgreSQL successfully made. Ready to install."
install:
make -C src install
@cat $(srcdir)/register.txt
clean:
make -C src clean
distclean:
make -C src distclean
-rm -f config.cache config.log config.status GNUmakefile
.PHONY: all install clean distclean

View File

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(backend/access/common/heaptuple.c)
AC_INIT(src/backend/access/common/heaptuple.c)
AC_PREFIX_DEFAULT(/usr/local/pgsql)
AC_CONFIG_HEADER(include/config.h)
AC_CONFIG_HEADER(src/include/config.h)
dnl Autoconf 2.12, at least, generates a useless relative path to install-sh
dnl unless we do this.
AC_CONFIG_AUX_DIR(`pwd`)
AC_PREREQ(2.13)
AC_CONFIG_AUX_DIR(config)
AC_CANONICAL_HOST
@ -58,14 +57,14 @@ esac
PORTNAME=${os}
CPU=${host_cpu}
AC_LINK_FILES(backend/port/dynloader/${os}.c, backend/port/dynloader.c)
AC_LINK_FILES(backend/port/dynloader/${os}.h, include/dynloader.h)
AC_LINK_FILES(include/port/${os}.h, include/os.h)
AC_LINK_FILES(makefiles/Makefile.${os}, Makefile.port)
AC_LINK_FILES(src/backend/port/dynloader/${os}.c, src/backend/port/dynloader.c)
AC_LINK_FILES(src/backend/port/dynloader/${os}.h, src/include/dynloader.h)
AC_LINK_FILES(src/include/port/${os}.h, src/include/os.h)
AC_LINK_FILES(src/makefiles/Makefile.${os}, src/Makefile.port)
if test "X$need_tas" = "Xyes"
then
AC_LINK_FILES(backend/port/tas/${tas_file}, backend/port/tas.s)
AC_LINK_FILES(src/backend/port/tas/${tas_file}, src/backend/port/tas.s)
TAS=tas.o
AC_SUBST(TAS)
fi
@ -94,7 +93,7 @@ AC_ARG_WITH(template,
host="`echo $host | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`"
# First, try for a template exactly matching $host
if test -f "template/$host"
if test -f "src/template/$host"
then TEMPLATE="$host"
else
# Scan template/.similar for a rule that tells us which template to use.
@ -117,7 +116,7 @@ else
then
echo "$LINE" | sed 's/^.*=//' > $TMPFILE
fi
done <template/.similar
done <src/template/.similar
GUESS=`cat $TMPFILE`
rm -f $TMPFILE
if test "$GUESS"
@ -131,7 +130,7 @@ fi
AC_MSG_RESULT($TEMPLATE)
export TEMPLATE
if test ! -f "template/$TEMPLATE"; then
if test ! -f "src/template/$TEMPLATE"; then
echo ""
echo "$TEMPLATE does not exist"
echo ""
@ -152,7 +151,7 @@ dnl the IDENTIFIER: lines translated, then source it.
[
rm -f conftest.sh
sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "template/$TEMPLATE" >conftest.sh
sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "src/template/$TEMPLATE" >conftest.sh
. ./conftest.sh
rm -f conftest.sh
]
@ -381,10 +380,10 @@ dnl Link in the port and template directories
dnl to help build a "standalone ODBC" tar file
if test "X$USE_ODBC" = "Xtrue"
then
AC_LINK_FILES(include/port, interfaces/odbc/port)
AC_LINK_FILES(makefiles, interfaces/odbc/makefiles)
AC_LINK_FILES(template, interfaces/odbc/template)
AC_LINK_FILES(include/config.h, interfaces/odbc/config.h)
AC_LINK_FILES(src/include/port, src/interfaces/odbc/port)
AC_LINK_FILES(src/makefiles, src/interfaces/odbc/makefiles)
AC_LINK_FILES(src/template, src/interfaces/odbc/template)
AC_LINK_FILES(src/include/config.h, src/interfaces/odbc/config.h)
AC_MSG_CHECKING(setting ODBCINST)
AC_ARG_WITH(
@ -1365,26 +1364,27 @@ dnl Finally ready to produce output files ...
AC_OUTPUT(
GNUmakefile
Makefile.global
backend/port/Makefile
backend/catalog/genbki.sh
backend/utils/Gen_fmgrtab.sh
bin/pg_dump/Makefile
bin/pg_version/Makefile
bin/pgtclsh/mkMakefile.tcldefs.sh
bin/pgtclsh/mkMakefile.tkdefs.sh
bin/psql/Makefile
include/version.h
interfaces/libpq/Makefile
interfaces/ecpg/lib/Makefile
interfaces/ecpg/preproc/Makefile
interfaces/libpq++/Makefile
interfaces/libpgeasy/Makefile
interfaces/libpgtcl/Makefile
interfaces/odbc/GNUmakefile
interfaces/odbc/Makefile.global
pl/plpgsql/src/Makefile
pl/plpgsql/src/mklang.sql
pl/tcl/mkMakefile.tcldefs.sh
test/regress/GNUmakefile
src/GNUmakefile
src/Makefile.global
src/backend/port/Makefile
src/backend/catalog/genbki.sh
src/backend/utils/Gen_fmgrtab.sh
src/bin/pg_dump/Makefile
src/bin/pg_version/Makefile
src/bin/pgtclsh/mkMakefile.tcldefs.sh
src/bin/pgtclsh/mkMakefile.tkdefs.sh
src/bin/psql/Makefile
src/include/version.h
src/interfaces/libpq/Makefile
src/interfaces/ecpg/lib/Makefile
src/interfaces/ecpg/preproc/Makefile
src/interfaces/libpq++/Makefile
src/interfaces/libpgeasy/Makefile
src/interfaces/libpgtcl/Makefile
src/interfaces/odbc/GNUmakefile
src/interfaces/odbc/Makefile.global
src/pl/plpgsql/src/Makefile
src/pl/plpgsql/src/mklang.sql
src/pl/tcl/mkMakefile.tcldefs.sh
src/test/regress/GNUmakefile
)

View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.50 2000/02/28 23:28:40 momjian Exp $
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.51 2000/06/06 22:00:47 petere Exp $
#
#-------------------------------------------------------------------------
@ -29,9 +29,6 @@ all:
$(MAKE) -C interfaces all
$(MAKE) -C bin all
$(MAKE) -C pl all
@if test $@. = all. -o $@. = .; then \
echo All of PostgreSQL is successfully made. Ready to install. ;\
fi
install: installdirs
$(MAKE) -C utils install
@ -39,10 +36,9 @@ install: installdirs
$(MAKE) -C interfaces install
$(MAKE) -C bin install
$(MAKE) -C pl install
cat ../register.txt
installdirs: mkinstalldirs
$(SRCDIR)/mkinstalldirs $(BINDIR) $(LIBDIR) $(INCLUDEDIR)
installdirs:
../config/mkinstalldirs $(BINDIR) $(LIBDIR) $(INCLUDEDIR)
clean:
$(MAKE) -C utils clean
@ -53,13 +49,10 @@ clean:
$(MAKE) -C test clean
$(MAKE) -C ../contrib/spi clean
# Remove files and symlinks created by configure script
distclean: clean
# Remove files and symlinks created by configure script
rm -f \
Makefile.port \
config.cache \
config.status \
config.log \
include/config.h \
include/dynloader.h \
include/os.h \
@ -103,9 +96,6 @@ distclean: clean
$(MAKE) -C interfaces $@
$(MAKE) -C bin $@
$(MAKE) -C pl $@
@if test $@. = all. -o $@. = .; then \
echo All of PostgreSQL is successfully made. Ready to install. ;\
fi
TAGS:
rm -f TAGS; \

View File

@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.66 2000/05/17 06:03:13 meskes Exp $
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.67 2000/06/06 22:00:52 petere Exp $
#
#-------------------------------------------------------------------------
@ -14,7 +14,7 @@ NAME= ecpg
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1.1
SRCDIR= @top_srcdir@
SRCDIR= ../../..
include $(SRCDIR)/Makefile.global
CFLAGS+= -I../include -I$(LIBPQDIR)

View File

@ -4,7 +4,7 @@
# Makefile for pgeasy library
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.6 2000/03/08 01:58:33 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.7 2000/06/06 22:00:53 petere Exp $
#
#-------------------------------------------------------------------------
@ -12,7 +12,7 @@ NAME= pgeasy
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@
SRCDIR= ../..
include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(LIBPQDIR)

View File

@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.40 2000/05/29 05:45:48 tgl Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.41 2000/06/06 22:01:01 petere Exp $
#
#-------------------------------------------------------------------------
@ -14,7 +14,7 @@ NAME= pgtcl
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@
SRCDIR= ../..
include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(LIBPQDIR)

View File

@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.25 2000/05/29 05:45:50 tgl Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.26 2000/06/06 22:01:06 petere Exp $
#
#-------------------------------------------------------------------------
@ -14,7 +14,7 @@ NAME= pq++
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@
SRCDIR= ../..
include $(SRCDIR)/Makefile.global
CXX=@CXX@

View File

@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.58 2000/05/28 17:56:25 tgl Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.59 2000/06/06 22:01:03 petere Exp $
#
#-------------------------------------------------------------------------
@ -14,7 +14,7 @@ NAME= pq
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@
SRCDIR= ../..
include $(SRCDIR)/Makefile.global
CFLAGS+= -DFRONTEND

View File

@ -7,13 +7,13 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.12 2000/03/02 02:01:00 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.13 2000/06/06 22:01:09 petere Exp $
#
#-------------------------------------------------------------------------
@SET_MAKE@
NAME = psqlodbc
SRCDIR= @top_srcdir@
SRCDIR= ../..
ODBCSRCDIR= @srcdir@
include $(SRCDIR)/Makefile.global
@ -91,7 +91,7 @@ standalone:
fi
-rm -f psqlodbc-$(SO_MAJOR_VERSION)$(SO_MINOR_VERSION).tar.gz
$(TAR) -chf psqlodbc-$(SO_MAJOR_VERSION)$(SO_MINOR_VERSION).tar \
$(SOURCES) -C @top_srcdir@ makefiles template Makefile.shlib
$(SOURCES) -C $(SRCDIR) makefiles template Makefile.shlib
gzip psqlodbc-$(SO_MAJOR_VERSION)$(SO_MINOR_VERSION).tar
.PHONY: integrated

View File

@ -4,7 +4,7 @@
# Makefile for the plpgsql shared object
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.23 2000/05/29 05:45:53 tgl Exp $
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.24 2000/06/06 22:01:12 petere Exp $
#
#-------------------------------------------------------------------------
@ -12,7 +12,7 @@ NAME= plpgsql
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
SRCDIR= @top_srcdir@
SRCDIR= ../../..
include $(SRCDIR)/Makefile.global
# If using flex, ask for a case-insensitive, lex-compatible lexer.

View File

@ -25,53 +25,51 @@
# Select make to use --- default gmake, can be overridden by env var
MAKE=${MAKE:-gmake}
cd src
# Configure ... should we run autoconf here???
./configure
# Generate parser's yacc and lex files
cd backend/parser
cd src/backend/parser
rm -f gram.c parse.h scan.c
$MAKE gram.c parse.h scan.c
cd ../..
cd ../../..
# Generate bootstrap parser's yacc and lex files
cd backend/bootstrap
cd src/backend/bootstrap
rm -f bootstrap_tokens.h bootparse.c bootscanner.c
$MAKE bootstrap_tokens.h bootparse.c bootscanner.c
cd ../..
cd ../../..
# Generate configuration file scanner
cd backend/utils/misc
cd src/backend/utils/misc
rm -f guc-file.c lex.yy.c
$MAKE guc-file.c
cd ../../..
cd ../../../..
# Generate ecpg preprocessor's yacc and lex files
cd interfaces/ecpg/preproc
cd src/interfaces/ecpg/preproc
rm -f preproc.c preproc.h pgc.c
$MAKE preproc.c preproc.h pgc.c
cd ../../..
cd ../../../..
# Generate plpgsql's yacc and lex files
cd pl/plpgsql/src
cd src/pl/plpgsql/src
rm -f pl_scan.c pl.tab.h pl_gram.c
$MAKE pl_scan.c pl.tab.h pl_gram.c
cd ../../..
cd ../../../..
# Generate psql's help on SQL command from the SGML docs
cd bin/psql
cd src/bin/psql
rm -f sql_help.h
$MAKE sql_help.h
cd ../..
cd ../../..
# Clean up