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

Commitadbf98a

Browse files
committed
Fix references to backend/port files so that they actually work.
1 parenta4fec9e commitadbf98a

File tree

1 file changed

+26
-14
lines changed

1 file changed

+26
-14
lines changed

‎src/bin/psql/Makefile.in

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.18 1999/11/26 04:24:16 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.19 1999/11/27 19:43:20 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -29,38 +29,50 @@ CFLAGS+= $(MBFLAGS)
2929
endif
3030

3131
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o\
32-
copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o\
33-
tab-complete.o @STRDUP@ @STRERROR2@ @SNPRINTF@
32+
copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o\
33+
tab-complete.o
3434

3535
all: submake psql
3636

37-
# Move this to the utils directory
37+
ifneq (@STRDUP@,)
38+
OBJS+=$(SRCDIR)/utils/strdup.o
39+
40+
$(SRCDIR)/utils/strdup.o:
41+
$(MAKE) -C$(SRCDIR)/utils strdup.o
42+
endif
43+
44+
# Move these to the utils directory?
45+
46+
ifneq (@STRERROR@,)
47+
OBJS+=$(SRCDIR)/backend/port/strerror.o
48+
49+
$(SRCDIR)/backend/port/strerror.o:
50+
$(MAKE) -C$(SRCDIR)/backend/port strerror.o
51+
endif
52+
3853
ifneq (@SNPRINTF@,)
39-
OBJS+=../../backend/port/snprintf.o
54+
OBJS+=$(SRCDIR)/backend/port/snprintf.o
4055

41-
../../backend/port/snprintf.o:
42-
$(MAKE) -C../../backend/port snprintf.o
56+
$(SRCDIR)/backend/port/snprintf.o:
57+
$(MAKE) -C$(SRCDIR)/backend/port snprintf.o
4358
endif
4459

60+
# End of hacks for picking up backend 'port' modules
61+
4562
psql:$(OBJS)$(LIBPQDIR)/libpq.a
4663
$(CC) -o psql -L$(LIBPQDIR)$(OBJS) -lpq$(LDFLAGS)
4764

48-
../../utils/strdup.o:
49-
$(MAKE) -C ../../utils strdup.o
50-
51-
OBJS:
52-
$(CC)$(CFLAGS) -c$< -o$@
53-
5465
help.o: sql_help.h
5566

5667
ifneq ($(strip$(PERL)),)
57-
sql_help.h:$(wildcard../../../doc/src/sgml/ref/*.sgml) create_help.pl
68+
sql_help.h:$(wildcard$(SRCDIR)/../doc/src/sgml/ref/*.sgml) create_help.pl
5869
$(PERL) create_help.pl sql_help.h
5970
else
6071
sql_help.h:
6172
endif
6273

6374
.PHONY: submake
75+
6476
submake:
6577
$(MAKE) -C$(LIBPQDIR) libpq.a
6678

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp