database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix references to backend/port files so that they actually work.

Browse Source
This commit is contained in:
Tom Lane
1999-11-27 19:43:20 +00:00
parent a4fec9ec34
commit adbf98a77f
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/bin/psql/Makefile.in
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.18 1999/11/26 04:24:16 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.19 1999/11/27 19:43:20 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -29,38 +29,50 @@ CFLAGS+= $(MBFLAGS)
endif endif
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \ 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 \ copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
tab-complete.o @STRDUP@ @STRERROR2@ @SNPRINTF@ tab-complete.o
all: submake psql all: submake psql
# Move this to the utils directory ifneq (@STRDUP@,)
ifneq (@SNPRINTF@,) OBJS+=$(SRCDIR)/utils/strdup.o
OBJS+=../../backend/port/snprintf.o
../../backend/port/snprintf.o: $(SRCDIR)/utils/strdup.o:
$(MAKE) -C ../../backend/port snprintf.o $(MAKE) -C $(SRCDIR)/utils strdup.o
endif endif
# Move these to the utils directory?
ifneq (@STRERROR@,)
OBJS+=$(SRCDIR)/backend/port/strerror.o
$(SRCDIR)/backend/port/strerror.o:
$(MAKE) -C $(SRCDIR)/backend/port strerror.o
endif
ifneq (@SNPRINTF@,)
OBJS+=$(SRCDIR)/backend/port/snprintf.o
$(SRCDIR)/backend/port/snprintf.o:
$(MAKE) -C $(SRCDIR)/backend/port snprintf.o
endif
# End of hacks for picking up backend 'port' modules
psql: $(OBJS) $(LIBPQDIR)/libpq.a psql: $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) $(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
../../utils/strdup.o:
$(MAKE) -C ../../utils strdup.o
OBJS:
$(CC) $(CFLAGS) -c $< -o $@
help.o: sql_help.h help.o: sql_help.h
ifneq ($(strip $(PERL)),) ifneq ($(strip $(PERL)),)
sql_help.h: $(wildcard ../../../doc/src/sgml/ref/*.sgml) create_help.pl sql_help.h: $(wildcard $(SRCDIR)/../doc/src/sgml/ref/*.sgml) create_help.pl
$(PERL) create_help.pl sql_help.h $(PERL) create_help.pl sql_help.h
else else
sql_help.h: sql_help.h:
endif endif
.PHONY: submake .PHONY: submake
submake: submake:
$(MAKE) -C $(LIBPQDIR) libpq.a $(MAKE) -C $(LIBPQDIR) libpq.a