open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure -L and -I's for our source tree are always before system include

Browse Source 
or library directories on the command line.
REL7_1_STABLE
Peter Eisentraut 25 years ago
parent c4a9023d52
commit cb6edf9d56
39 changed files with 95 additions and 100 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      contrib/array/Makefile
  2. 4
      contrib/cube/Makefile
  3. 4
      contrib/earthdistance/Makefile
  4. 9
      contrib/findoidjoins/Makefile
  5. 4
      contrib/fulltextindex/Makefile
  6. 4
      contrib/intarray/Makefile
  7. 4
      contrib/isbn_issn/Makefile
  8. 4
      contrib/lo/Makefile
  9. 4
      contrib/mSQL-interface/Makefile
  10. 4
      contrib/miscutil/Makefile
  11. 4
      contrib/noupdate/Makefile
  12. 7
      contrib/oid2name/Makefile
  13. 6
      contrib/pg_dumplo/Makefile
  14. 6
      contrib/pgbench/Makefile
  15. 2
      contrib/rserv/Makefile
  16. 4
      contrib/seg/Makefile
  17. 4
      contrib/spi/Makefile
  18. 4
      contrib/string/Makefile
  19. 4
      contrib/userlock/Makefile
  20. 6
      contrib/vacuumlo/Makefile
  21. 8
      src/Makefile.global.in
  22. 7
      src/Makefile.shlib
  23. 4
      src/backend/tioga/Makefile
  24. 8
      src/bin/pg_dump/Makefile
  25. 4
      src/bin/pg_encoding/Makefile
  26. 8
      src/bin/pgtclsh/Makefile
  27. 6
      src/bin/psql/Makefile
  28. 4
      src/interfaces/ecpg/lib/Makefile
  29. 5
      src/interfaces/ecpg/preproc/Makefile
  30. 8
      src/interfaces/libpgeasy/Makefile
  31. 8
      src/interfaces/libpgtcl/Makefile
  32. 4
      src/interfaces/libpq++/Makefile
  33. 6
      src/interfaces/libpq/Makefile
  34. 4
      src/interfaces/odbc/GNUmakefile
  35. 5
      src/makefiles/Makefile.win
  36. 4
      src/pl/plpgsql/src/Makefile
  37. 4
      src/test/bench/Makefile
  38. 2
      src/test/examples/Makefile
  39. 4
      src/test/regress/GNUmakefile

4
contrib/array/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.13 2000/10/20 21:03:03 petere Exp $
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.14 2001/02/20 19:20:26 petere Exp $
#
subdir = contrib/array
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := array_iterator
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

4
contrib/cube/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/cube
@ -14,7 +14,7 @@ NAME= cube
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS= cube.o cubeparse.o cubescan.o buffer.o

4
contrib/earthdistance/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.7 2000/10/20 21:03:03 petere Exp $
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.8 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/earthdistance
@ -9,7 +9,7 @@ include ../../src/Makefile.global
NAME := earthdistance
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

9
contrib/findoidjoins/Makefile
Unescape View File

@ -1,19 +1,22 @@
#
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.11 2000/12/04 01:32:18 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.12 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/findoidjoins
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
libpgeasy_builddir = $(top_builddir)/src/interfaces/libpgeasy
override CPPFLAGS := -I$(libpgeasy_srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = findoidjoins.o
all: findoidjoins
findoidjoins: $(OBJS) $(libpgeasy_builddir)/libpgeasy.a $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpgeasy) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $(OBJS) -L$(libpgeasy_builddir) -lpgeasy $(libpq) $(LDFLAGS) $(LIBS) -o $@
install: all installdirs
$(INSTALL_PROGRAM) findoidjoins$(X) $(bindir)

4
contrib/fulltextindex/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.8 2000/10/20 21:03:10 petere Exp $
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/fulltextindex
@ -9,7 +9,7 @@ include ../../src/Makefile.global
NAME := fti
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

4
contrib/intarray/Makefile
Unescape View File

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.2 2001/01/13 02:18:31 petere Exp $
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
subdir = contrib/intarray
top_builddir = ../..
@ -12,7 +12,7 @@ NAME= _int
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS += -I$(srcdir) -DPGSQL71
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DPGSQL71
OBJS= _int.o

4
contrib/isbn_issn/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.8 2000/10/20 21:03:13 petere Exp $
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/isbn_issn
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := isbn_issn
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

4
contrib/lo/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.8 2000/10/20 21:03:16 petere Exp $
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/lo
@ -12,7 +12,7 @@ SONAME := $(NAME)$(DLSUFFIX)
SQLS = $(NAME).sql lo_drop.sql lo_test.sql
MODS = $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
ifdef REFINT_VERBOSE

4
contrib/mSQL-interface/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.6 2000/10/20 21:03:18 petere Exp $
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/mSQL-interface
@ -11,7 +11,7 @@ SO_MAJOR_VERSION := 0
SO_MINOR_VERSION := 0
OBJS := mpgsql.o
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
include $(top_srcdir)/src/Makefile.shlib

4
contrib/miscutil/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.13 2000/10/20 21:03:21 petere Exp $
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.14 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/miscutil
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := misc_utils
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

4
contrib/noupdate/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.6 2000/10/20 21:03:24 petere Exp $
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/noupdate
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := noup
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

7
contrib/oid2name/Makefile
Unescape View File

@ -1,18 +1,17 @@
#
#
# $Header: /cvsroot/pgsql/contrib/oid2name/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
subdir = contrib/oid2name
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = oid2name.o
all: oid2name
oid2name: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@ -g
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ -g
install: all installdirs
$(INSTALL_PROGRAM) oid2name$(X) $(bindir)

6
contrib/pg_dumplo/Makefile
Unescape View File

@ -1,19 +1,19 @@
#
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.9 2000/12/04 01:32:18 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.10 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/pg_dumplo
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = main.o lo_export.o lo_import.o utils.o
all: pg_dumplo
pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
install: all installdirs
$(INSTALL_PROGRAM) pg_dumplo$(X) $(bindir)

6
contrib/pgbench/Makefile
Unescape View File

@ -1,19 +1,19 @@
#
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.8 2000/12/04 01:32:19 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
#
subdir = contrib/pgbench
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = pgbench.o
all: pgbench
pgbench: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
install: all installdirs
$(INSTALL_PROGRAM) pgbench$(X) $(bindir)

2
contrib/rserv/Makefile
Unescape View File

@ -14,7 +14,7 @@ PERLS += SlaveInit SlaveAddTable GetSyncID
PERLS += PrepareSnapshot ApplySnapshot
SCRIPTS = InitRservTest
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)

4
contrib/seg/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.3 2001/02/20 19:20:28 petere Exp $
#
subdir = contrib/seg
@ -14,7 +14,7 @@ NAME= seg
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS= seg.o segparse.o segscan.o buffer.o

4
contrib/spi/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.18 2000/10/20 21:03:31 petere Exp $
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.19 2001/02/20 19:20:28 petere Exp $
#
subdir = contrib/spi
@ -12,7 +12,7 @@ SQLS = $(OBJS:.o=.sql)
EXAMPLES= $(OBJS:.o=.example)
MODS = $(OBJS:.o=$(DLSUFFIX))
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
ifdef REFINT_VERBOSE

4
contrib/string/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.13 2000/10/20 21:03:32 petere Exp $
# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.14 2001/02/20 19:20:28 petere Exp $
#
subdir = contrib/string
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := string_io
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

4
contrib/userlock/Makefile
Unescape View File

@ -1,5 +1,5 @@
#
# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.13 2000/10/20 21:03:34 petere Exp $
# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.14 2001/02/20 19:20:28 petere Exp $
#
subdir = contrib/userlock
@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
NAME := user_locks
SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql

6
contrib/vacuumlo/Makefile
Unescape View File

@ -1,19 +1,19 @@
#
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.9 2000/12/04 01:32:19 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.10 2001/02/20 19:20:28 petere Exp $
#
subdir = contrib/vacuumlo
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = vacuumlo.o
all: vacuumlo
vacuumlo: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
install: all installdirs
$(INSTALL_PROGRAM) vacuumlo$(X) $(bindir)

8
src/Makefile.global.in
Unescape View File

@ -1,5 +1,5 @@
# -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.118 2001/02/07 20:13:27 tgl Exp $
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.119 2001/02/20 19:20:28 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@ -137,7 +137,7 @@ DOCBOOKSTYLE = @DOCBOOKSTYLE@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
override CPPFLAGS += $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)
override CPPFLAGS := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) $(CPPFLAGS)
CC = @CC@
GCC = @GCC@
@ -240,10 +240,6 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
libpq_builddir = $(top_builddir)/src/interfaces/libpq
libpq = -L$(libpq_builddir) -lpq
libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
libpgeasy_builddir = $(top_builddir)/src/interfaces/libpgeasy
libpgeasy = -L$(libpgeasy_builddir) -lpgeasy
##########################################################################
#

7
src/Makefile.shlib
Unescape View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.44 2001/02/10 18:46:34 momjian Exp $
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.45 2001/02/20 19:20:28 petere Exp $
#
#-------------------------------------------------------------------------
@ -230,9 +230,6 @@ ifeq ($(PORTNAME), beos)
SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
endif
# Pull in any extra -L options that the user might have specified.
SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
ifeq ($(enable_rpath), yes)
SHLIB_LINK += $(rpath)
endif
@ -298,7 +295,7 @@ else # PORTNAME == win
# WIN case
$(shlib) lib$(NAME).a: $(OBJS) $(top_builddir)/src/utils/dllinit.o
$(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS)
$(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(SHLIB_LINK)
$(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK)
$(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a
$(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c

4
src/backend/tioga/Makefile
Unescape View File

@ -4,7 +4,7 @@
# Makefile for tioga
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.9 2000/10/20 21:03:50 petere Exp $
# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.10 2001/02/20 19:20:28 petere Exp $
#
#-------------------------------------------------------------------------
@ -13,7 +13,7 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = tgRecipe.o Varray.o
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
all: SUBSYS.o

8
src/bin/pg_dump/Makefile
Unescape View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.28 2001/02/18 18:33:59 momjian Exp $
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.29 2001/02/20 19:20:28 petere Exp $
#
#-------------------------------------------------------------------------
@ -16,15 +16,15 @@ include $(top_builddir)/src/Makefile.global
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \
pg_backup_null.o pg_backup_tar.o $(STRDUP)
override CPPFLAGS+= -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
all: submake pg_dump pg_restore pg_dumpall
pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) pg_restore.o $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
../../utils/strdup.o:
$(MAKE) -C ../../utils strdup.o

4
src/bin/pg_encoding/Makefile
Unescape View File

@ -4,7 +4,7 @@
#
# Copyright (c) 1998, PostgreSQL Global Development Group
#
# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.12 2000/11/30 20:36:11 petere Exp $
# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.13 2001/02/20 19:20:28 petere Exp $
#
#-------------------------------------------------------------------------
@ -17,7 +17,7 @@ OBJS= pg_encoding.o
all: submake pg_encoding
pg_encoding: $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
.PHONY: submake

8
src/bin/pgtclsh/Makefile
Unescape View File

@ -6,7 +6,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.36 2001/02/18 18:34:01 momjian Exp $
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.37 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -26,7 +26,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
override CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES)
override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES)
# If we are here then Tcl is available
@ -40,10 +40,10 @@ endif
all: submake $(PROGRAMS)
pgtclsh: pgtclAppInit.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LIBS) -o $@
$(CC) $(CFLAGS) $^ $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS) $(LIBS) -o $@
pgtksh: pgtkAppInit.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LIBS) -o $@
$(CC) $(CFLAGS) $^ $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LDFLAGS) $(LIBS) -o $@
.PHONY: submake
submake:

6
src/bin/psql/Makefile
Unescape View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.28 2001/02/18 18:34:01 momjian Exp $
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.29 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
override CPPFLAGS+= -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
@ -49,7 +49,7 @@ endif
# End of hacks for picking up backend 'port' modules
psql: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
help.o: $(srcdir)/sql_help.h

4
src/interfaces/ecpg/lib/Makefile
Unescape View File

@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.10 2000/10/20 21:04:05 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.11 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -16,7 +16,7 @@ NAME= ecpg
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 2.0
override CPPFLAGS += -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \

5
src/interfaces/ecpg/preproc/Makefile
Unescape View File

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.73 2001/02/10 22:31:42 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.74 2001/02/20 19:20:29 petere Exp $
subdir = src/interfaces/ecpg/preproc
top_builddir = ../../../..
@ -8,7 +8,8 @@ MAJOR_VERSION=2
MINOR_VERSION=8
PATCHLEVEL=0
override CPPFLAGS+=-I$(srcdir)/../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
override CPPFLAGS := -I$(srcdir)/../include $(CPPFLAGS) \
-DMAJOR_VERSION=$(MAJOR_VERSION) \
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-DINCLUDE_PATH=\"$(includedir)\"

8
src/interfaces/libpgeasy/Makefile
Unescape View File

@ -2,7 +2,7 @@
#
# Makefile for src/interfaces/libpgeasy
#
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.5 2000/10/31 14:37:25 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.6 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -16,16 +16,16 @@ NAME= pgeasy
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= libpgeasy.o halt.o
SHLIB_LINK+= $(libpq)
SHLIB_LINK = $(libpq)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
# braindead; users of libpq should not need to know what it depends on.)
SHLIB_LINK+= $(filter -lcrypt, $(LIBS))
SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
all: all-lib

8
src/interfaces/libpgtcl/Makefile
Unescape View File

@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.24 2000/10/31 14:37:25 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.25 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -16,16 +16,16 @@ NAME= pgtcl
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
SHLIB_LINK+= $(libpq)
SHLIB_LINK = $(libpq)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is
# braindead; users of libpq should not need to know what it depends on.)
SHLIB_LINK+= $(filter -lcrypt, $(LIBS))
SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
all: submake all-lib

4
src/interfaces/libpq++/Makefile
Unescape View File

@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.27 2000/10/23 21:43:57 petere Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.28 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -16,7 +16,7 @@ NAME= pq++
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o

6
src/interfaces/libpq/Makefile
Unescape View File

@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.50 2001/02/11 01:52:11 ishii Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.51 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -17,7 +17,7 @@ NAME= pq
SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1
override CPPFLAGS += -DFRONTEND -I$(srcdir) -DSYSCONFDIR='"$(sysconfdir)"'
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
pqexpbuffer.o dllist.o pqsignal.o \
@ -30,7 +30,7 @@ endif
# Add libraries that libpq depends (or might depend) on into the
# shared library link. (The order in which you list them here doesn't
# matter.)
SHLIB_LINK += $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv, $(LIBS))
SHLIB_LINK += $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv, $(LIBS))
all: all-lib

4
src/interfaces/odbc/GNUmakefile
Unescape View File

@ -2,7 +2,7 @@
#
# GNUMakefile for psqlodbc (Postgres ODBC driver)
#
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.13 2001/02/14 05:45:38 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.14 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -15,7 +15,7 @@ NAME = psqlodbc
SO_MAJOR_VERSION = 0
SO_MINOR_VERSION = 26
override CPPFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \

5
src/makefiles/Makefile.win
Unescape View File

@ -1,12 +1,11 @@
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.8 2001/01/09 18:45:41 petere Exp $
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.9 2001/02/20 19:20:29 petere Exp $
LDFLAGS+= -g
DLLTOOL= dlltool
DLLWRAP= dllwrap
DLLLIBS=-L/usr/local/lib -L$(top_builddir)/src/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32
DLLLIBS=-L$(top_builddir)/src/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32
MK_NO_LORDER=true
MAKE_DLL=true
#MAKE_DLL=false
SHLIB_LINK=$(DLLLIBS)
# linking with -lm or -lc causes program to crash
# (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
LIBS:=$(filter-out -lm -lc, $(LIBS))

4
src/pl/plpgsql/src/Makefile
Unescape View File

@ -2,7 +2,7 @@
#
# Makefile for the plpgsql shared object
#
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.11 2001/02/10 22:31:42 petere Exp $
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.12 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -15,7 +15,7 @@ NAME= plpgsql
SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS += -I$(srcdir)
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o

4
src/test/bench/Makefile
Unescape View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.8 2000/10/20 21:04:19 petere Exp $
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.9 2001/02/20 19:20:29 petere Exp $
#
#-------------------------------------------------------------------------
@ -18,7 +18,7 @@ include $(top_builddir)/src/Makefile.global
CREATEFILES= create.sql bench.sql
OUTFILES= bench.out bench.out.perquery
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)

2
src/test/examples/Makefile
Unescape View File

@ -6,7 +6,7 @@ subdir = src/test/examples
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS+= -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
LIBS += $(libpq)

4
src/test/regress/GNUmakefile
Unescape View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.32 2000/11/22 13:16:24 petere Exp $
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.33 2001/02/20 19:20:30 petere Exp $
#
#-------------------------------------------------------------------------
@ -17,7 +17,7 @@ include $(top_builddir)/src/Makefile.global
contribdir := $(top_builddir)/contrib
override CPPFLAGS += -I$(libpq_srcdir)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)

Write Preview
Loading…
Cancel
Save