Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9979660

Browse files
committed
Fix missing dependency for Makefile inclusions.
Get rid of some stray tabs that might confuse Make.
1 parent 9f39b9a commit 9979660

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/bin/pgtclsh/Makefile

+10-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.23 1998/10/18 04:16:08 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.24 1998/10/27 21:51:54 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -19,7 +19,7 @@ include ../../Makefile.global
1919
#
2020
include Makefile.tcldefs
2121
ifeq ($(USE_TK), true)
22-
include Makefile.tkdefs
22+
include Makefile.tkdefs
2323
endif
2424

2525
CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
@@ -29,7 +29,6 @@ LDFLAGS+= $(KRBLIBS)
2929
CFLAGS+= $(KRBFLAGS)
3030
endif
3131

32-
# try to find libpgtcl.a in either directory
3332
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
3433
LIBPQ= -L$(LIBPQDIR) -lpq
3534

@@ -39,18 +38,12 @@ INSTPGMS = install_tcl
3938

4039
# Add TK targets if TK is available
4140
ifeq ($(USE_TK), true)
42-
PGMS += pgtksh
43-
INSTPGMS += install_tk
41+
PGMS += pgtksh
42+
INSTPGMS += install_tk
4443
endif
4544

4645
all: $(PGMS)
4746

48-
Makefile.tcldefs:
49-
/bin/sh mkMakefile.tcldefs.sh
50-
51-
Makefile.tkdefs:
52-
/bin/sh mkMakefile.tkdefs.sh
53-
5447
pgtclsh: pgtclAppInit.o
5548
$(CC) $(CFLAGS) $(TCL_DEFS) -o $@ pgtclAppInit.o \
5649
$(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
@@ -68,6 +61,12 @@ install_tcl: pgtclsh
6861
install_tk: pgtksh
6962
$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
7063

64+
Makefile.tcldefs: mkMakefile.tcldefs.sh
65+
/bin/sh mkMakefile.tcldefs.sh
66+
67+
Makefile.tkdefs: mkMakefile.tkdefs.sh
68+
/bin/sh mkMakefile.tkdefs.sh
69+
7170
clean:
7271
rm -f *.o Makefile.t*defs pgtclsh pgtksh
7372

0 commit comments

Comments
 (0)