Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd7dd929

Browse files
author
Bryan Henderson
committed
End of the make file simplifications.
1 parent594525a commitd7dd929

File tree

13 files changed

+254
-262
lines changed

13 files changed

+254
-262
lines changed

‎src/interfaces/libpgtcl/Makefile

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,55 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.4 1996/11/08 00:58:07 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.5 1996/11/12 11:42:09 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
LIB=pgtcl
14+
SRCDIR= ..
15+
LIBPQDIR=$(SRCDIR)/libpq
16+
include ../Makefile.global
1517

16-
MKDIR=../mk
17-
include$(MKDIR)/postgres.mk
18-
19-
CFLAGS+= -I$(HEADERDIR)\
20-
-I$(srcdir)/backend/include\
21-
-I$(srcdir)/backend\
22-
-I$(CURDIR)\
23-
-I$(TCL_INCDIR)\
24-
-I$(srcdir)/libpq
25-
26-
LIBLDLIBS+= -L$(LIBDIR) -lpq
18+
INCLUDE_OPT=\
19+
-I../backend\
20+
-I../include\
21+
-I$(LIBPQDIR)\
22+
-I$(TCL_INCDIR)
2723

24+
CFLAGS+=$(INCLUDE_OPT)
2825
ifdefKRBVERS
2926
CFLAGS+=$(KRBFLAGS)
3027
endif
3128

3229
ifdefLINUX_ELF
3330
CFLAGS += -fPIC
34-
CC += -L$(POSTGRESDIR)/lib -lpq
3531
endif
3632

37-
LIBSRCS= pgtcl.c pgtclCmds.c pgtclId.c
33+
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
3834

39-
install-headers:
40-
$(INSTALL)$(INSTLOPTS) libpgtcl.h$(HEADERDIR)/libpgtcl.h
35+
all: libpgtcl.a
36+
37+
libpgtcl.a:$(OBJS)
38+
ifdefMK_NO_LORDER
39+
$(AR) $(AROPT) libpgtcl.a $(OBJS)
40+
else
41+
$(AR) $(AROPT) libpgtcl.a `lorder $(OBJS) | tsort`
42+
endif
43+
$(RANLIB) libpgtcl.a
44+
45+
.PHONY: beforeinstall-headers install-headers
46+
.PHONY: install install-libpgtcl
4147

48+
install: install-headers install-libpgtcl
49+
50+
install-headers: beforeinstall-headers libpgtcl.h
51+
$(INSTALL)$(INSTLOPTS) libpgtcl.h$(HEADERDIR)/libpgtcl.h
4252

43-
install:: install-headers
53+
beforeinstall-headers:
54+
@if [!-d$(HEADERDIR) ];then mkdir$(HEADERDIR);fi
4455

45-
include$(MKDIR)/postgres.lib.mk
56+
install-libpgtcl: libpgtcl.a
57+
$(INSTALL)$(INSTL_LIB_OPTS) libpgtcl.a$(DESTDIR)$(LIBDIR)/libpgtcl.a
4658

59+
.PHONY: clean
60+
clean:
61+
rm -f$(OBJS)

‎src/interfaces/libpq++/Makefile

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,60 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.1.1.1 1996/07/09 06:22:18 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.2 1996/11/12 11:42:24 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
CPP_LIB=true
14+
SRCDIR= ..
15+
LIBPQDIR=$(SRCDIR)/libpq
16+
include ../Makefile.global
1517

16-
LIB=pq++
18+
CXXFLAGS=$(CFLAGS)
1719

18-
MKDIR=../mk
19-
include$(MKDIR)/postgres.mk
20+
INCLUDE_OPT=\
21+
-I../backend\
22+
-I../include\
23+
-I$(LIBPQDIR)
2024

21-
CXXFLAGS =$(CFLAGS)
22-
23-
CXXFLAGS+= -I$(srcdir)/backend/include\
24-
-I$(srcdir)/backend\
25-
-I$(srcdir)/libpq\
26-
-I$(CURDIR)\
25+
CXXFLAGS+=$(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
2726

2827
ifdefKRBVERS
2928
CXXFLAGS+=$(KRBFLAGS)
3029
endif
3130

31+
OBJS= pgenv.o pgconnection.o pglobject.o
3232

33-
LIBSRCS = pgenv.cc pgconnection.cc pglobject.cc
34-
35-
.PHONY: beforeinstall-headers install-headers
33+
all: libpq++.a examples
3634

37-
ifndefNO_BEFOREINSTL
38-
beforeinstall-headers:
39-
@-if [!-d$(HEADERDIR) ];then mkdir$(HEADERDIR);fi
35+
libpq++.a:$(OBJS)
36+
ifdefMK_NO_LORDER
37+
$(AR) $(AROPT) libpq++.a $(OBJS)
4038
else
41-
beforeinstall-headers: .dosomething
39+
$(AR) $(AROPT) libpq++.a `lorder $(OBJS) | tsort`
4240
endif
41+
$(RANLIB) libpq++.a
42+
43+
.PHONY: examples
44+
examples:
45+
$(MAKE) -C examples all
4346

44-
HEADERFILES = libpq++.H
47+
.PHONY: beforeinstall-headers install-headers
48+
.PHONY: install install-libpq++ doc
49+
50+
install: install-headers install-libpq++ doc
51+
52+
install-headers: beforeinstall-headers libpq++.H
53+
$(INSTALL)$(INSTLOPTS) libpq++.H$(HEADERDIR)/libpq++.H
54+
55+
beforeinstall-headers:
56+
@if [!-d$(HEADERDIR) ];then mkdir$(HEADERDIR);fi
4557

46-
install-headers: beforeinstall-headers
47-
@for iin${HEADERFILES};do\
48-
echo"Installing$(HEADERDIR)/$$i.";\
49-
$(INSTALL) -c -m 444$$i$(HEADERDIR)/$$i;\
50-
done
58+
install-libpq++: libpq++.a
59+
$(INSTALL)$(INSTL_LIB_OPTS) libpq++.a$(DESTDIR)$(LIBDIR)/libpq++.a
5160

52-
install:: install-headers
61+
doc:
62+
$(MAKE) -C man install
5363

54-
include$(MKDIR)/postgres.lib.mk
64+
clean:
65+
rm libpq++.a$(OBJS)
66+
$(MAKE) -C examples clean

‎src/interfaces/libpq++/examples/Makefile

Lines changed: 23 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22
# Makefile for example programs
33
#
44

5-
CPP_PROG = true
5+
SRCDIR= ../..
6+
LIBPQDIR=$(SRCDIR)/libpq
7+
include ../../Makefile.global
68

7-
MKDIR=../../mk
8-
include$(MKDIR)/postgres.mk
9+
CXXFLAGS=$(CFLAGS)
910

10-
CXXFLAGS+= -I$(HEADERDIR) -I$(srcdir)/libpq -I$(srcdir)/backend\
11-
-I$(srcdir)/backend/include
11+
INCLUDE_OPT=\
12+
-I..\
13+
-I../../backend\
14+
-I../../include\
15+
-I$(LIBPQDIR)
1216

13-
LD_ADD+=-L$(LIBDIR) -lpq++ -lpq
17+
CXXFLAGS+=$(INCLUDE_OPT)
18+
19+
LD_ADD+= -L.. -lpq++ -L$(LIBPQDIR) -lpq
1420

1521
#
1622
# And where libpq goes, so goes the authentication stuff...
@@ -20,51 +26,19 @@ LD_ADD+= $(KRBLIBS)
2026
CXXFLAGS+=$(KRBFLAGS)
2127
endif
2228

23-
P0_PROG:= testlibpq0
24-
P0_OBJS:= testlibpq0.o
25-
26-
$(P0_PROG):$(addprefix$(objdir)/,$(P0_OBJS))
27-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
28-
29-
P1_PROG:= testlibpq1
30-
P1_OBJS:= testlibpq1.o
31-
32-
$(P1_PROG):$(addprefix$(objdir)/,$(P1_OBJS))
33-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
34-
35-
P2_PROG:= testlibpq2
36-
P2_OBJS:= testlibpq2.o
37-
38-
$(P2_PROG):$(addprefix$(objdir)/,$(P2_OBJS))
39-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
40-
41-
P3_PROG:= testlibpq3
42-
P3_OBJS:= testlibpq3.o
43-
44-
$(P3_PROG):$(addprefix$(objdir)/,$(P3_OBJS))
45-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
46-
47-
P4_PROG:= testlibpq4
48-
P4_OBJS:= testlibpq4.o
49-
50-
$(P4_PROG):$(addprefix$(objdir)/,$(P4_OBJS))
51-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
52-
53-
P5_PROG:= testlo
54-
P5_OBJS:= testlo.o
29+
PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo
5530

56-
$(P5_PROG):$(addprefix$(objdir)/,$(P5_OBJS))
57-
$(CXX)$(CFLAGS) -o$(objdir)/$(@F)$<$(LD_ADD)
31+
all: submake$(PROGS)
5832

59-
OBJS:=$(P0_OBJS)$(P1_OBJS)$(P2_OBJS)$(P3_OBJS)$(P4_OBJS)$(P5_OBJS)
60-
PROGS:=$(P0_PROG)$(P1_PROG)$(P2_PROG)$(P3_PROG)$(P4_PROG)$(P5_PROG)
33+
$(PROGS):% :%.cc ../libpq++.a
34+
$(CXX)$(CXXFLAGS)$(LDFLAGS) -o$@$@.cc$(LD_ADD)
6135

62-
CLEANFILES+=$(OBJS)$(PROGS)
36+
.PHONY: submake
37+
submake:
38+
$(MAKE) -C.. libpq++.a
6339

64-
all::$(PROGS)
40+
../libpq++.a:
41+
$(MAKE) -C.. libpq++.a
6542

66-
install::$(PROGS)
67-
@for iin${PROGS};do\
68-
echo"Installing$$i";\
69-
$(INSTALL)$(objdir)/$$i$(DESTDIR)$(BINDIR)/$$i;\
70-
done
43+
clean:
44+
rm -f$(PROGS)

‎src/interfaces/libpq++/libpq++.H

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* IDENTIFICATION
1616
*
17-
* $Id: libpq++.H,v 1.2 1996/08/21 04:32:09 scrappy Exp $
17+
* $Id: libpq++.H,v 1.3 1996/11/12 11:42:27 bryanh Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -26,6 +26,8 @@
2626
#include<strings.h>
2727

2828
extern"C" {
29+
#include"config.h"
30+
#include"postgres.h"
2931
#include"libpq-fe.h"
3032
#include"fe-auth.h"
3133
}

‎src/interfaces/libpq++/pglobject.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
* Copyright (c) 1994, Regents of the University of California
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.1.1.1 1996/07/09 06:22:18 scrappy Exp $
14+
* $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/pglobject.cc,v 1.2 1996/11/12 11:42:31 bryanh Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
1818
#include"libpq++.H"
1919

2020
extern"C" {
21+
#include<unistd.h>
22+
#include<fcntl.h>
2123
#include"libpq/libpq-fs.h"
2224
}
2325

‎src/interfaces/libpq/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.15 1996/11/09 06:24:51 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.16 1996/11/12 11:42:21 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -127,10 +127,10 @@ else
127127
install-shlib-dep :=
128128
endif
129129

130-
install-libpq:
130+
install-libpq: libpq.a
131131
$(INSTALL)$(INSTL_LIB_OPTS) libpq.a$(DESTDIR)$(LIBDIR)/libpq.a
132132

133-
install-shlib:
133+
install-shlib: libpq.so.1
134134
$(INSTALL)$(INSTL_LIB_OPTS) libpq.so.1$(DESTDIR)$(LIBDIR)/libpq.so.1
135135

136136
dependdep:

‎src/test/Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/Makefile,v 1.1.1.1 1996/07/09 06:22:20 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/Makefile,v 1.2 1996/11/12 11:42:41 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SUBDIR= bench regress
15-
16-
include ../mk/postgres.subdir.mk
17-
18-
14+
.DEFAULTall:
15+
$(MAKE) -C bench$@
16+
$(MAKE) -C regress$@

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp