summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in27
1 files changed, 14 insertions, 13 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index c2a66b6..228e01a 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.36 2000/05/19 18:57:59 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.37 2000/06/13 21:01:05 ericm Exp $
VERSION = @TCL_VERSION@
@@ -47,7 +47,7 @@ LIB_RUNTIME_DIR = $(libdir)
# Directory in which to install the program tclsh:
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
-# Directory in which to install libtcl.so or libtcl.a:
+# Directory in which to install the .a or .so binary for the Tcl library:
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Path name to use when installing library scripts.
@@ -130,7 +130,7 @@ DDE_DLL_FILE = tcldde$(VER)${DLLSUFFIX}
DDE_LIB_FILE = tcldde$(VER)${LIBSUFFIX}
REG_DLL_FILE = tclreg$(VER)${DLLSUFFIX}
REG_LIB_FILE = tclreg$(VER)${LIBSUFFIX}
-PIPE_DLL_FILE = tclpip$(VER).dll
+PIPE_DLL_FILE = tclpip$(VER)${DLLSUFFIX}
SHARED_LIBRARIES = $(TCL_DLL_FILE) $(TCL_STUB_LIB_FILE) \
$(DDE_DLL_FILE) $(REG_DLL_FILE) $(PIPE_DLL_FILE)
@@ -169,7 +169,7 @@ EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
STLIB_LD = @STLIB_LD@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(LIBS)
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
VER = @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@
@@ -178,6 +178,7 @@ LIBS = @LIBS@
RMDIR = rm -rf
MKDIR = mkdir -p
+SHELL = @SHELL@
RM = rm -f
COPY = cp
@@ -301,7 +302,7 @@ all: binaries libraries doc
tcltest: $(TCLTEST)
-binaries: @LIBRARIES@ $(STATIC_LIBRARIES) $(TCLSH)
+binaries: @LIBRARIES@ $(TCLSH)
libraries:
@@ -323,11 +324,11 @@ $(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32) tclsh.$(RES)
$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME)
-cat32.${OBJEXT}: cat.c
+cat32.$(OBJEXT): cat.c
$(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME)
-$(CAT32): cat32.${OBJEXT}
- $(CC) $(CFLAGS) cat32.${OBJEXT} $(CC_EXENAME) $(LDFLAGS_CONSOLE)
+$(CAT32): cat32.$(OBJEXT)
+ $(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
# The following targets are configured by autoconf to generate either
# a shared library or static library
@@ -339,7 +340,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS}
${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES)
@$(RM) ${TCL_DLL_FILE}
- @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES)
+ @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
${TCL_LIB_FILE}: ${TCL_OBJS}
@$(RM) ${TCL_LIB_FILE}
@@ -348,11 +349,11 @@ ${TCL_LIB_FILE}: ${TCL_OBJS}
${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
@$(RM) ${DDE_DLL_FILE}
- @MAKE_DLL@ ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
+ @MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
@$(RM) ${REG_DLL_FILE}
- @MAKE_DLL@ ${REG_OBJS} ${TCL_STUB_LIB_FILE}
+ @MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
# PIPE_DLL_FILE is actually an executable, don't build it
# like a DLL.
@@ -513,14 +514,14 @@ runtest: tcltest
depend:
-Makefile: Makefile.in
+Makefile: $(SRC_DIR)/Makefile.in
./config.status
cleanhelp:
$(RM) *.hlp *.cnt *.GID *.rtf man2tcl.exe
clean: cleanhelp
- $(RM) *.lib *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
+ $(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
$(RM) $(TCLSH) $(TCLTEST) $(CAT32)
$(RM) *.pch *.ilk *.pdb