Renamed "tclkit" to "tclzsh"

Removed tclzsh from "make binaries". (It the user wants it, they have to ask for it. It requires a working Tclsh and an exernal Zip)

1 files changed, 29 insertions, 29 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 16721a9..918e9fc 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -169,11 +169,11 @@ INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
 EXE_SUFFIX		= @EXEEXT@
 TCL_EXE			= tclsh${EXE_SUFFIX}
 ifeq ($(SHARED_BUILD),0)
-TCLKIT_BASE		= tclkits
+TCLZSH_BASE		= tclzshs
 else
-TCLKIT_BASE		= tclkitd
+TCLZSH_BASE		= tclzshd
 endif
-TCLKIT_EXE		= ${TCLKIT_BASE}${EXE_SUFFIX}
+TCLZSH_EXE		= ${TCLZSH_BASE}${EXE_SUFFIX}
 
 TCLTEST_EXE		= tcltest${EXE_SUFFIX}
 NATIVE_TCLSH		= @TCLSH_PROG@
@@ -367,7 +367,7 @@ ZLIB_OBJS = Zadler32.o Zcompress.o Zcrc32.o Zdeflate.o Zinfback.o \
 TCL_OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \
 	${OO_OBJS} @DL_OBJS@ @PLAT_OBJS@
 
-TCLKIT_OBJS = tclKitInit.o tclZipVfs.o tclZipVfsBoot.o
+TCLZSH_OBJS = tclZipShInit.o tclZipVfs.o tclZipVfsBoot.o
 
 OBJS = ${TCL_OBJS} ${TOMMATH_OBJS} @DTRACE_OBJ@ @ZLIB_OBJS@
 
@@ -624,7 +624,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
 
 all: binaries libraries doc packages
 
-binaries: ${LIB_FILE} ${TCL_EXE} ${TCLKIT_EXE}
+binaries: ${LIB_FILE} ${TCL_EXE}
 
 libraries:
 
@@ -667,36 +667,36 @@ null.zip:
 
 # Rather than force an install, pack the files we need into a
 # file system under our control
-tclkit.vfs:
-	@echo "Building VFS File system in tclkit.vfs"
+tclzsh.vfs:
+	@echo "Building VFS File system in tclzsh.vfs"
 	@$(TCL_EXE) "$(TOP_DIR)/tools/mkVfs.tcl" \
-	    "$(UNIX_DIR)/tclkit.vfs/boot/tcl" "$(TOP_DIR)"  unix
+	    "$(UNIX_DIR)/tclzsh.vfs/boot/tcl" "$(TOP_DIR)"  unix
 
-tclkit: ${TCLKIT_EXE}
+tclzsh: ${TCLZSH_EXE}
 
-${TCLKIT_BASE}_bare: ${TCLKIT_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE}
+${TCLZSH_BASE}_bare: ${TCLZSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE}
 	${CC} ${CFLAGS} ${LDFLAGS} \
-		${TCLKIT_OBJS} \
+		${TCLZSH_OBJS} \
 		@TCL_BUILD_LIB_SPEC@ \
 		${LIBS} @EXTRA_TCLSH_LIBS@ \
-		${CC_SEARCH_FLAGS} -o ${TCLKIT_BASE}_bare
+		${CC_SEARCH_FLAGS} -o ${TCLZSH_BASE}_bare
 
 
 # Builds an executable linked to the Tcl dynamic library
-${TCLKIT_EXE}: ${TCLKIT_BASE}_bare  null.zip tclkit.vfs
-	cp -f ${TCLKIT_BASE}_bare ${TCLKIT_BASE}.zip
-	cat null.zip >> ${TCLKIT_BASE}.zip
-	cd tclkit.vfs ; zip -rAq ${UNIX_DIR}/${TCLKIT_BASE}.zip .
-	mv ${TCLKIT_BASE}.zip ${TCLKIT_EXE}
+${TCLZSH_EXE}: ${TCLZSH_BASE}_bare  null.zip tclzsh.vfs
+	cp -f ${TCLZSH_BASE}_bare ${TCLZSH_BASE}.zip
+	cat null.zip >> ${TCLZSH_BASE}.zip
+	cd tclzsh.vfs ; zip -rAq ${UNIX_DIR}/${TCLZSH_BASE}.zip .
+	mv ${TCLZSH_BASE}.zip ${TCLZSH_EXE}
 
 # Builds an executable directly from the Tcl sources
-tclkit-static: ${TCLKIT_OBJS} ${OBJS} ${ZLIB_OBJS} null.zip tclkit.vfs
+tclzsh-static: ${TCLZSH_OBJS} ${OBJS} ${ZLIB_OBJS} null.zip tclzsh.vfs
 	${CC} ${CFLAGS} ${LDFLAGS} \
-		${TCLKIT_OBJS} ${OBJS} ${ZLIB_OBJS} \
+		${TCLZSH_OBJS} ${OBJS} ${ZLIB_OBJS} \
 		${LIBS} @EXTRA_TCLSH_LIBS@ \
-		${CC_SEARCH_FLAGS} -o ${TCLKIT_EXE}
-	cat null.zip >> ${TCLKIT_EXE}
-	cd tclkit.vfs ; zip -rAq ${UNIX_DIR}/${TCLKIT_EXE} .
+		${CC_SEARCH_FLAGS} -o ${TCLZSH_EXE}
+	cat null.zip >> ${TCLZSH_EXE}
+	cd tclzsh.vfs ; zip -rAq ${UNIX_DIR}/${TCLZSH_EXE} .
 
 Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
 	$(SHELL) config.status
@@ -706,8 +706,8 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
 clean: clean-packages
 	rm -f *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \
 		errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@ \
-		${TCLKIT_EXE} tclkit*
-	rm -rf tclkit.vfs null.zip
+		${TCLZSH_EXE} tclzsh*
+	rm -rf tclzsh.vfs null.zip
 	cd dltest ; $(MAKE) clean
 
 distclean: distclean-packages clean
@@ -851,8 +851,8 @@ install-binaries: binaries
 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
-	@echo "Installing ${TCLKIT_EXE} as $(BIN_INSTALL_DIR)/${TCLKIT_BASE}$(VERSION)${EXE_SUFFIX}"
-	@$(INSTALL_PROGRAM) ${TCLKIT_EXE} "$(BIN_INSTALL_DIR)/${TCLKIT_BASE}$(VERSION)${EXE_SUFFIX}"
+	@echo "Installing ${TCLZSH_EXE} as $(BIN_INSTALL_DIR)/${TCLZSH_BASE}$(VERSION)${EXE_SUFFIX}"
+	@$(INSTALL_PROGRAM) ${TCLZSH_EXE} "$(BIN_INSTALL_DIR)/${TCLZSH_BASE}$(VERSION)${EXE_SUFFIX}"
 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
 	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
 	@echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
@@ -1076,9 +1076,9 @@ xtTestInit.o: $(UNIX_DIR)/tclAppInit.c ${TCL_EXE}
 	    mv tclAppInit.sav tclAppInit.o; \
 	fi;
 	
-tclKitInit.o: $(UNIX_DIR)/tclAppInit.c ${TCL_EXE}
+tclZipShInit.o: $(UNIX_DIR)/tclAppInit.c ${TCL_EXE}
 	$(CC) -c $(APP_CC_SWITCHES) \
-		-DTCL_ZIPVFS $(UNIX_DIR)/tclAppInit.c -o tclKitInit.o
+		-DTCL_ZIPVFS $(UNIX_DIR)/tclAppInit.c -o tclZipShInit.o
 	
 # Object files used on all Unix systems:
 
@@ -2186,7 +2186,7 @@ BUILD_HTML = \
 .PHONY: install-tzdata install-msgs
 .PHONY: packages configure-packages test-packages clean-packages
 .PHONY: dist-packages distclean-packages install-packages
-.PHONY: tclkit-static tclkit
+.PHONY: tclzsh-static tclzsh
 
 #--------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.