Added "doc" target to the Makefile that will build the winhelp files

3 files changed, 44 insertions, 5 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 9ac204f..47cf387 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.21 1999/08/12 23:14:43 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.22 1999/12/06 01:46:07 wart Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -96,6 +96,9 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 CFLAGS = 		@CFLAGS@
 
+# Special compiler flags to use when building man2tcl on Windows.
+MAN2TCLFLAGS =		@MAN2TCLFLAGS@
+
 SRC_DIR			= @srcdir@
 ROOT_DIR		= @srcdir@/..
 GENERIC_DIR		= @srcdir@/../generic
@@ -128,6 +131,7 @@ STATIC_LIBRARIES	= $(TCL_LIB_FILE)
 TCLSH			= tclsh$(VER)${EXESUFFIX}
 TCLTEST			= tcltest${EXEEXT}
 CAT32			= cat32$(EXEEXT)
+MAN2TCL			= man2tcl$(EXEEXT)
 
 @SET_MAKE@
 
@@ -278,6 +282,8 @@ TCLSH_OBJS = tclAppInit.$(OBJEXT)
 
 TCL_OBJS = ${GENERIC_OBJS} ${WIN_OBJS} ${COMPAT_OBJS}
 
+TCL_DOCS = $(ROOT_DIR)/doc/*.[13n]
+
 all: binaries libraries doc
 
 tcltest: $(TCLTEST)
@@ -286,7 +292,13 @@ binaries: @LIBRARIES@ $(STATIC_LIBRARIES) $(TCLSH)
 
 libraries:
 
-doc:
+doc: $(ROOT_DIR)/tools/man2help.tcl $(MAN2TCL) $(TCL_DOCS)
+	TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
+	./$(TCLSH) "$(ROOT_DIR_NATIVE)"/tools/man2help.tcl tcl "$(VER)" $(TCL_DOCS)
+	hcw /c /e tcl.hpj
+
+$(MAN2TCL): $(ROOT_DIR)/tools/man2tcl.c
+	$(CC) $(CFLAGS) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(ROOT_DIR_NATIVE)"/tools/man2tcl.c
 
 $(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS)
 	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) $(CC_EXENAME) 
@@ -474,7 +486,8 @@ Makefile: Makefile.in
 
 clean:
 	$(RM) *.lib *.exp *.dll *.${OBJEXT} *~ \#* TAGS a.out
-	$(RM) $(TCLSH) $(TCLTEST) $(CAT32)
+	$(RM) *.hlp *.cnt *.GID *.rtf
+	$(RM) $(TCLSH) $(TCLTEST) $(CAT32) man2tcl.exe
 	$(RM) *.pch *.ilk *.pdb
 
 distclean: clean
diff --git a/win/configure.in b/win/configure.in
index 7c24c20..80a5cb4 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.14 1999/10/05 22:47:05 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.15 1999/12/06 01:46:08 wart Exp $
 
 AC_INIT(../generic/tcl.h)
 
@@ -73,6 +73,13 @@ LDFLAGS=${LDFLAGS_DEFAULT}
 TCL_DBGX=${DBGX}
 
 #--------------------------------------------------------------------
+# man2tcl needs this so that it can use errno.h
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H")
+AC_SUBST(MAN2TCLFLAGS)
+
+#--------------------------------------------------------------------
 # Perform final evaluations of variables with possible substitutions.
 #--------------------------------------------------------------------
 
@@ -132,4 +139,4 @@ AC_SUBST(LIBRARIES)
 AC_SUBST(MAKE_LIB)
 AC_SUBST(MAKE_DLL)
 
-AC_OUTPUT(Makefile tclConfig.sh)
+AC_OUTPUT(Makefile tclConfig.sh tcl.hpj)
diff --git a/win/tcl.hpj.in b/win/tcl.hpj.in
new file mode 100644
index 0000000..3400816
--- /dev/null
+++ b/win/tcl.hpj.in
@@ -0,0 +1,19 @@
+; This file is maintained by HCW. Do not modify this file directly.

+

+[OPTIONS]

+HCW=0

+LCID=0x409 0x0 0x0 ;English (United States)

+REPORT=Yes

+TITLE=Tcl/Tk Reference Manual

+CNT=tcl83.cnt

+COPYRIGHT=Copyright © 1999 Scriptics Corporation

+HLP=tcl83.hlp

+

+[FILES]

+tcl.rtf

+

+[WINDOWS]

+main="Tcl/Tk Reference Manual",,0

+

+[CONFIG]

+BrowseButtons()