summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane1998-10-27 21:51:54 +0000
committerTom Lane1998-10-27 21:51:54 +0000
commit997966061e1408020586556fdf03358d5f0b8589 (patch)
tree82b08695d451171f2b0a09c78da1c79755f6412e
parent9f39b9a15b36cd5b314e310493aedd756d6af614 (diff)
Fix missing dependency for Makefile inclusions.
Get rid of some stray tabs that might confuse Make.
-rw-r--r--src/bin/pgtclsh/Makefile21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 325c70e3350..459ed4660b1 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
#
#
# 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
#
include Makefile.tcldefs
ifeq ($(USE_TK), true)
- include Makefile.tkdefs
+include Makefile.tkdefs
endif
CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
@@ -29,7 +29,6 @@ LDFLAGS+= $(KRBLIBS)
CFLAGS+= $(KRBFLAGS)
endif
-# try to find libpgtcl.a in either directory
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
LIBPQ= -L$(LIBPQDIR) -lpq
@@ -39,18 +38,12 @@ INSTPGMS = install_tcl
# Add TK targets if TK is available
ifeq ($(USE_TK), true)
- PGMS += pgtksh
- INSTPGMS += install_tk
+PGMS += pgtksh
+INSTPGMS += install_tk
endif
all: $(PGMS)
-Makefile.tcldefs:
- /bin/sh mkMakefile.tcldefs.sh
-
-Makefile.tkdefs:
- /bin/sh mkMakefile.tkdefs.sh
-
pgtclsh: pgtclAppInit.o
$(CC) $(CFLAGS) $(TCL_DEFS) -o $@ pgtclAppInit.o \
$(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
@@ -68,6 +61,12 @@ install_tcl: pgtclsh
install_tk: 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:
rm -f *.o Makefile.t*defs pgtclsh pgtksh