Skip to content

Commit 24201b4

Browse files
bmomjianbmomjian
committed
Make libpgport be front-end only and make libpgport_srv be a backend
library that uses palloc, ereport, etc. This simplifies the makefiles for client applications.
1 parent 3da69bd commit 24201b4

File tree

12 files changed

+109
-95
lines changed

12 files changed

+109
-95
lines changed

‎src/backend/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.104 2004/08/01 18:07:42 tgl Exp $
7+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.105 2004/10/04 13:43:54 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -26,6 +26,8 @@ ifeq ($(PORTNAME), qnx4)
2626
OBJS+= bootstrap/bootstrap.o
2727
endif
2828

29+
# Use server version of port library
30+
LIBS := $(patsubst -lpgport,-lpgport_srv, $(LIBS))
2931

3032
##########################################################################
3133

‎src/bin/initdb/Makefile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,23 @@
55
# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.44 2004/08/29 04:13:01 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.45 2004/10/04 13:43:55 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

1212
subdir = src/bin/initdb
1313
top_builddir = ../../..
1414
include $(top_builddir)/src/Makefile.global
1515

16-
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
16+
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
1717

18-
OBJS= initdb.o dirmod.o exec.o
18+
OBJS= initdb.o
1919

2020
all: submake-libpq submake-libpgport initdb
2121

2222
initdb: $(OBJS) $(libpq_builddir)/libpq.a
2323
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
2424

25-
dirmod.c: % : $(top_srcdir)/src/port/%
26-
rm -f $@ && $(LN_S) $< .
27-
28-
exec.c: % : $(top_srcdir)/src/port/%
29-
rm -f $@ && $(LN_S) $< .
30-
3125
install: all installdirs
3226
$(INSTALL_PROGRAM) initdb$(X) $(DESTDIR)$(bindir)/initdb$(X)
3327

@@ -38,7 +32,7 @@ uninstall:
3832
rm -f $(DESTDIR)$(bindir)/initdb$(X)
3933

4034
clean distclean maintainer-clean:
41-
rm -f initdb$(X) $(OBJS) dirmod.c exec.c
35+
rm -f initdb$(X) $(OBJS)
4236

4337

4438
# ensure that changes in datadir propagate into object file

‎src/bin/pg_config/Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.8 2004/08/01 06:56:38 momjian Exp $
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile for src/bin/pg_controldata
4+
#
5+
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
6+
#
7+
# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.9 2004/10/04 13:43:55 momjian Exp $
8+
#
9+
#-------------------------------------------------------------------------
210

311
subdir = src/bin/pg_config
412
top_builddir = ../../..
513
include $(top_builddir)/src/Makefile.global
614

7-
OBJS= pg_config.o exec.o
15+
OBJS= pg_config.o
816

9-
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)
17+
override CPPFLAGS := -I$(libpq_srcdir) -DVAL_CONFIGURE="\"$(configure_args)\"" $(CPPFLAGS)
1018

1119
all: submake-libpgport pg_config
1220

13-
exec.c: % : $(top_srcdir)/src/port/%
14-
rm -f $@ && $(LN_S) $< .
15-
1621
pg_config: $(OBJS)
1722
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
1823

@@ -26,4 +31,4 @@ uninstall:
2631
rm -f $(DESTDIR)$(bindir)/pg_config
2732

2833
clean distclean maintainer-clean:
29-
rm -f pg_config$(X) $(OBJS) exec.c
34+
rm -f pg_config$(X) $(OBJS)

‎src/bin/pg_controldata/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.9 2004/05/26 17:24:01 tgl Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.10 2004/10/04 13:43:55 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
override CPPFLAGS += -DFRONTEND
1616

17-
OBJS= pg_controldata.o pg_crc.o exec.o
17+
OBJS= pg_controldata.o pg_crc.o
1818

1919
all: submake-libpgport pg_controldata
2020

@@ -24,9 +24,6 @@ pg_controldata: $(OBJS)
2424
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
2525
rm -f $@ && $(LN_S) $< .
2626

27-
exec.c: % : $(top_srcdir)/src/port/%
28-
rm -f $@ && $(LN_S) $< .
29-
3027
install: all installdirs
3128
$(INSTALL_PROGRAM) pg_controldata$(X) $(DESTDIR)$(bindir)/pg_controldata$(X)
3229

@@ -37,4 +34,4 @@ uninstall:
3734
rm -f $(DESTDIR)$(bindir)/pg_controldata$(X)
3835

3936
clean distclean maintainer-clean:
40-
rm -f pg_controldata$(X) $(OBJS) pg_crc.c exec.c
37+
rm -f pg_controldata$(X) $(OBJS) pg_crc.c

‎src/bin/pg_ctl/Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,23 @@
55
# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.15 2004/08/29 04:13:01 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.16 2004/10/04 13:43:56 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

1212
subdir = src/bin/pg_ctl
1313
top_builddir = ../../..
1414
include $(top_builddir)/src/Makefile.global
1515

16-
override CPPFLAGS := -DFRONTEND -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
16+
override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
1717

18-
OBJS= pg_ctl.o exec.o
18+
OBJS= pg_ctl.o
1919

2020
all: submake-libpq submake-libpgport pg_ctl
2121

2222
pg_ctl: $(OBJS) $(libpq_builddir)/libpq.a
2323
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
2424

25-
exec.c: % : $(top_srcdir)/src/port/%
26-
rm -f $@ && $(LN_S) $< .
27-
2825
install: all installdirs
2926
$(INSTALL_PROGRAM) pg_ctl$(X) $(DESTDIR)$(bindir)/pg_ctl$(X)
3027

@@ -35,7 +32,7 @@ uninstall:
3532
rm -f $(DESTDIR)$(bindir)/pg_ctl$(X)
3633

3734
clean distclean maintainer-clean:
38-
rm -f pg_ctl$(X) $(OBJS) exec.c
35+
rm -f pg_ctl$(X) $(OBJS)
3936

4037

4138
# ensure that changes in DEF_PGPORT propagate into object file

‎src/bin/pg_dump/Makefile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.52 2004/05/25 01:00:24 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.53 2004/10/04 13:43:56 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

1212
subdir = src/bin/pg_dump
1313
top_builddir = ../../..
1414
include $(top_builddir)/src/Makefile.global
1515

16-
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
16+
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
1717

1818
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
1919
pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
20-
dumputils.o exec.o
20+
dumputils.o
2121

2222
EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
2323

@@ -30,12 +30,8 @@ pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(libpq_builddir)/libpq.a
3030
pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
3131
$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
3232

33-
pg_dumpall: pg_dumpall.o dumputils.o exec.o $(libpq_builddir)/libpq.a
34-
$(CC) $(CFLAGS) pg_dumpall.o dumputils.o exec.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
35-
36-
# We need our own build of exec.c so it gets made with -DFRONTEND
37-
exec.c: % : $(top_srcdir)/src/port/%
38-
rm -f $@ && $(LN_S) $< .
33+
pg_dumpall: pg_dumpall.o dumputils.o $(libpq_builddir)/libpq.a
34+
$(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
3935

4036
.PHONY: submake-backend
4137
submake-backend:
@@ -54,4 +50,4 @@ uninstall:
5450
rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall$(X))
5551

5652
clean distclean maintainer-clean:
57-
rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o exec.c
53+
rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o

‎src/bin/pg_resetxlog/Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.11 2004/08/01 06:22:38 momjian Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.12 2004/10/04 13:43:57 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,22 +14,16 @@ include $(top_builddir)/src/Makefile.global
1414

1515
override CPPFLAGS += -DFRONTEND
1616

17-
OBJS= pg_resetxlog.o pg_crc.o dirmod.o exec.o
17+
OBJS= pg_resetxlog.o pg_crc.o
1818

1919
all: submake-libpgport pg_resetxlog
2020

2121
pg_resetxlog: $(OBJS)
2222
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@$(X)
2323

24-
dirmod.c: % : $(top_srcdir)/src/port/%
25-
rm -f $@ && $(LN_S) $< .
26-
2724
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
2825
rm -f $@ && $(LN_S) $< .
2926

30-
exec.c: % : $(top_srcdir)/src/port/%
31-
rm -f $@ && $(LN_S) $< .
32-
3327
install: all installdirs
3428
$(INSTALL_PROGRAM) pg_resetxlog$(X) $(DESTDIR)$(bindir)/pg_resetxlog$(X)
3529

@@ -40,4 +34,4 @@ uninstall:
4034
rm -f $(DESTDIR)$(bindir)/pg_resetxlog$(X)
4135

4236
clean distclean maintainer-clean:
43-
rm -f pg_resetxlog$(X) $(OBJS) pg_crc.c dirmod.c exec.c
37+
rm -f pg_resetxlog$(X) $(OBJS) pg_crc.c

‎src/bin/psql/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.47 2004/05/24 01:01:37 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.48 2004/10/04 13:43:57 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -19,7 +19,7 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
1919

2020
OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
2121
startup.o prompt.o variables.o large_obj.o print.o describe.o \
22-
psqlscan.o tab-complete.o mbprint.o exec.o
22+
psqlscan.o tab-complete.o mbprint.o
2323

2424
FLEXFLAGS = -Cfe
2525

@@ -29,9 +29,6 @@ all: submake-libpq submake-libpgport psql
2929
psql: $(OBJS) $(libpq_builddir)/libpq.a
3030
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
3131

32-
exec.c: % : $(top_srcdir)/src/port/%
33-
rm -f $@ && $(LN_S) $< .
34-
3532
help.o: $(srcdir)/sql_help.h
3633

3734
ifdef PERL
@@ -63,7 +60,7 @@ uninstall:
6360

6461
# psqlscan.c is in the distribution tarball, so is not cleaned here
6562
clean distclean:
66-
rm -f psql$(X) $(OBJS) exec.c
63+
rm -f psql$(X) $(OBJS)
6764

6865
maintainer-clean: distclean
6966
rm -f $(srcdir)/sql_help.h $(srcdir)/psqlscan.c

‎src/bin/scripts/Makefile

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.28 2004/05/26 17:24:05 tgl Exp $
8+
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.29 2004/10/04 13:43:57 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -15,28 +15,25 @@ include $(top_builddir)/src/Makefile.global
1515

1616
PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb
1717

18-
override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
18+
override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
1919

2020
all: submake-libpq submake-backend $(PROGRAMS)
2121

2222
%: %.o
2323
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
2424

25-
createdb: createdb.o common.o exec.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
26-
createlang: createlang.o common.o exec.o print.o mbprint.o
27-
createuser: createuser.o common.o exec.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
28-
dropdb: dropdb.o common.o exec.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
29-
droplang: droplang.o common.o exec.o print.o mbprint.o
30-
dropuser: dropuser.o common.o exec.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
31-
clusterdb: clusterdb.o common.o exec.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
32-
vacuumdb: vacuumdb.o common.o exec.o
25+
createdb: createdb.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
26+
createlang: createlang.o common.o print.o mbprint.o
27+
createuser: createuser.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
28+
dropdb: dropdb.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
29+
droplang: droplang.o common.o print.o mbprint.o
30+
dropuser: dropuser.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
31+
clusterdb: clusterdb.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
32+
vacuumdb: vacuumdb.o common.o
3333

3434
dumputils.c: % : $(top_srcdir)/src/bin/pg_dump/%
3535
rm -f $@ && $(LN_S) $< .
3636

37-
exec.c: % : $(top_srcdir)/src/port/%
38-
rm -f $@ && $(LN_S) $< .
39-
4037
print.c mbprint.c : % : $(top_srcdir)/src/bin/psql/%
4138
rm -f $@ && $(LN_S) $< .
4239

@@ -64,5 +61,5 @@ uninstall:
6461

6562
clean distclean maintainer-clean:
6663
rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
67-
rm -f common.o dumputils.o exec.o print.o mbprint.o
68-
rm -f dumputils.c exec.c print.c mbprint.c
64+
rm -f common.o dumputils.o print.o mbprint.o
65+
rm -f dumputils.c print.c mbprint.c

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.107 2004/05/24 01:01:38 momjian Exp $
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile for src/interfaces/ecpg/preproc
4+
#
5+
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
6+
#
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.108 2004/10/04 13:43:58 momjian Exp $
8+
#
9+
#-------------------------------------------------------------------------
210

311
subdir = src/interfaces/ecpg/preproc
412
top_builddir = ../../../..
@@ -10,26 +18,21 @@ PATCHLEVEL=0
1018

1119
override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \
1220
-DMAJOR_VERSION=$(MAJOR_VERSION) \
13-
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
14-
-DFRONTEND
21+
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)
1522

1623
ifeq ($(GCC), yes)
1724
override CFLAGS += -Wno-error
1825
endif
1926
override CFLAGS += $(PTHREAD_CFLAGS)
2027

2128
OBJS= preproc.o type.o ecpg.o ecpg_keywords.o output.o\
22-
keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o \
23-
exec.o
29+
keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o
2430

2531
all: submake-libpgport ecpg
2632

2733
ecpg: $(OBJS)
2834
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@$(X)
2935

30-
exec.c: % : $(top_srcdir)/src/port/%
31-
rm -f $@ && $(LN_S) $< .
32-
3336
# pgc is compiled as part of preproc
3437
preproc.o: $(srcdir)/pgc.c
3538

@@ -66,7 +69,7 @@ uninstall:
6669
rm -f $(DESTDIR)$(bindir)/ecpg$(X)
6770

6871
clean distclean:
69-
rm -f *.o ecpg$(X) exec.c
72+
rm -f *.o ecpg$(X)
7073
# garbage from partial builds
7174
@rm -f y.tab.c y.tab.h
7275
# garbage from development

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy