Commit 99796606 authored by Tom Lane's avatar Tom Lane

Fix missing dependency for Makefile inclusions.

Get rid of some stray tabs that might confuse Make.
parent 9f39b9a1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.23 1998/10/18 04:16:08 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.24 1998/10/27 21:51:54 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -19,7 +19,7 @@ include ../../Makefile.global ...@@ -19,7 +19,7 @@ include ../../Makefile.global
# #
include Makefile.tcldefs include Makefile.tcldefs
ifeq ($(USE_TK), true) ifeq ($(USE_TK), true)
include Makefile.tkdefs include Makefile.tkdefs
endif endif
CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
...@@ -29,7 +29,6 @@ LDFLAGS+= $(KRBLIBS) ...@@ -29,7 +29,6 @@ LDFLAGS+= $(KRBLIBS)
CFLAGS+= $(KRBFLAGS) CFLAGS+= $(KRBFLAGS)
endif endif
# try to find libpgtcl.a in either directory
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
LIBPQ= -L$(LIBPQDIR) -lpq LIBPQ= -L$(LIBPQDIR) -lpq
...@@ -39,18 +38,12 @@ INSTPGMS = install_tcl ...@@ -39,18 +38,12 @@ INSTPGMS = install_tcl
# Add TK targets if TK is available # Add TK targets if TK is available
ifeq ($(USE_TK), true) ifeq ($(USE_TK), true)
PGMS += pgtksh PGMS += pgtksh
INSTPGMS += install_tk INSTPGMS += install_tk
endif endif
all: $(PGMS) all: $(PGMS)
Makefile.tcldefs:
/bin/sh mkMakefile.tcldefs.sh
Makefile.tkdefs:
/bin/sh mkMakefile.tkdefs.sh
pgtclsh: pgtclAppInit.o pgtclsh: pgtclAppInit.o
$(CC) $(CFLAGS) $(TCL_DEFS) -o $@ pgtclAppInit.o \ $(CC) $(CFLAGS) $(TCL_DEFS) -o $@ pgtclAppInit.o \
$(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS) $(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
...@@ -68,6 +61,12 @@ install_tcl: pgtclsh ...@@ -68,6 +61,12 @@ install_tcl: pgtclsh
install_tk: pgtksh install_tk: pgtksh
$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
Makefile.tcldefs: mkMakefile.tcldefs.sh
/bin/sh mkMakefile.tcldefs.sh
Makefile.tkdefs: mkMakefile.tkdefs.sh
/bin/sh mkMakefile.tkdefs.sh
clean: clean:
rm -f *.o Makefile.t*defs pgtclsh pgtksh rm -f *.o Makefile.t*defs pgtclsh pgtksh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment