diff options
Diffstat (limited to 'src/bin/psql/Makefile')
| -rw-r--r-- | src/bin/psql/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 5baa463bbc1..dbaa5836b48 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.34 2002/07/15 21:34:05 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.35 2002/07/27 20:10:05 petere Exp $ # #------------------------------------------------------------------------- @@ -19,12 +19,9 @@ 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 \ - sprompt.o tab-complete.o mbprint.o $(SNPRINTF) $(STRDUP) \ - $(STRERROR) $(STRTOUL) + sprompt.o tab-complete.o mbprint.o -all: submake psql - -# End of hacks for picking up backend 'port' modules +all: submake-libpq submake-libpgport psql psql: $(OBJS) $(libpq_builddir)/libpq.a $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ @@ -39,11 +36,6 @@ $(srcdir)/sql_help.h: @echo "*** Perl is needed to build psql help." endif -.PHONY: submake - -submake: - $(MAKE) -C $(libpq_builddir) all - distprep: $(srcdir)/sql_help.h install: all installdirs @@ -55,15 +47,8 @@ installdirs: uninstall: rm -f $(DESTDIR)$(bindir)/psql$(X) -depend dep: - $(CC) -MM -MG $(CFLAGS) *.c >depend - clean distclean: rm -f psql$(X) $(OBJS) maintainer-clean: distclean rm -f $(srcdir)/sql_help.h - -ifeq (depend,$(wildcard depend)) -include depend -endif |