--- Makefile.in.orig	Sun Mar 26 18:23:45 1995
+++ Makefile.in	Sun Mar 26 19:53:40 1995
@@ -26,7 +26,12 @@
 # override the compiled-in location):
 TK_LIBRARY =	$(prefix)/lib/tk
 
-# Directory in which to install the archive libtk.a:
+# Name of the shared library built
+TK_SLIB_NAME =	libtk.so.3.6
+TK_LIB_NAME  =	libtk.a
+PICFLAGS= -fpic -DPIC
+
+# Directory in which to install libtk
 LIB_DIR =	$(exec_prefix)/lib
 
 # Directory in which to install the program wish:
@@ -52,11 +57,11 @@
 # The directory containing the Tcl sources and headers appropriate
 # for this version of Tk ("@srcdir@" will be replaced or has already
 # been replaced by the configure script):
-TCL_DIR =	@srcdir@/../tcl7.3jp
+TCL_DIR =	@tcl_include_dir@
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
-TCL_BIN_DIR =	../tcl7.3jp
+TCL_BIN_DIR =	@tcl_bin_dir@
 
 # A "-I" switch that can be used when compiling to make all of the
 # X11 include files accessible (the configure script will try to
@@ -73,7 +78,7 @@
 # and the math library (in that order).  The "@LIBS@" part will be
 # replaced (or has already been replaced) with relevant libraries as
 # determined by the configure script.
-LIBS = libtk.a $(TCL_BIN_DIR)/libtcl.a $(X11_LIB_SWITCHES) @LIBS@ -lm
+LIBS = -L. -ltk -L$(TCL_BIN_DIR) -ltcl $(X11_LIB_SWITCHES) @LIBS@ -lm
 
 # To change the compiler switches, for example to change from -O
 # to -g, change the following line:
@@ -131,6 +136,10 @@
 
 
 CC =		@CC@
+SCC_SWITCHES =	${PICFLAGS} ${CFLAGS} -I${SRC_DIR} -I${TCL_DIR} ${X11_INCLUDES} \
+${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KANJI_FLAGS} \
+-DTK_LIBRARY=\"${TK_LIBRARY}\"
+
 CC_SWITCHES =	${CFLAGS} -I${SRC_DIR} -I${TCL_DIR} ${X11_INCLUDES} \
 ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KANJI_FLAGS} \
 -DTK_LIBRARY=\"${TK_LIBRARY}\"
@@ -139,31 +148,54 @@
 	tkMenu.o tkMenubutton.o tkMessage.o tkScale.o \
 	tkScrollbar.o
 
+SWIDGOBJS = tkButton.so tkEntry.so tkFrame.so tkListbox.so \
+	tkMenu.so tkMenubutton.so tkMessage.so tkScale.so \
+	tkScrollbar.so
+
 CANVOBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvLine.o \
 	tkCanvPoly.o tkCanvPs.o tkCanvText.o tkCanvWind.o \
 	tkRectOval.o tkTrig.o
 
+SCANVOBJS = tkCanvas.so tkCanvArc.so tkCanvBmap.so tkCanvLine.so \
+	tkCanvPoly.so tkCanvPs.so tkCanvText.so tkCanvWind.so \
+	tkRectOval.so tkTrig.so
+
 TEXTOBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextIndex.o tkTextTag.o
 
+STEXTOBJS = tkText.so tkTextBTree.so tkTextDisp.so tkTextIndex.so tkTextTag.so
+
 KANJIOBJS = tkWStr.o tkKinput2.o tkCtext.o
 
+SKANJIOBJS = tkWStr.so tkKinput2.so tkCtext.so
+
 OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkCmds.o \
 	tkColor.o tkConfig.o tkCursor.o tkError.o tkEvent.o \
 	tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \
         tkMain.o tkOption.o tkPack.o tkPlace.o tkPreserve.o tkSelect.o \
         tkSend.o tkWindow.o tkWm.o $(WIDGOBJS) \
 	$(CANVOBJS) $(TEXTOBJS) $(KANJIOBJS)
+
+SOBJS = tk3d.so tkArgv.so tkAtom.so tkBind.so tkBitmap.so tkCmds.so \
+	tkColor.so tkConfig.so tkCursor.so tkError.so tkEvent.so \
+	tkFocus.so tkFont.so tkGet.so tkGC.so tkGeometry.so tkGrab.so \
+        tkMain.so tkOption.so tkPack.so tkPlace.so tkPreserve.so tkSelect.so \
+        tkSend.so tkWindow.so tkWm.so $(SWIDGOBJS) \
+	$(SCANVOBJS) $(STEXTOBJS) $(SKANJIOBJS)
+
 DEMOPROGS = browse color dialog hello ixset rmt rolodex size square \
 	tcolor timer widget
 
-all: libtk.a wish
+all: $(TK_LIB_NAME) $(TK_SLIB_NAME) wish
 
-libtk.a: $(OBJS)
-	rm -f libtk.a
-	ar cr libtk.a $(OBJS)
-	$(RANLIB) libtk.a
+$(TK_SLIB_NAME): $(SOBJS)
+	ld -Bshareable -Bforcearchive -o $@ ${SOBJS}
 
-wish: tkAppInit.o libtk.a $(TCL_BIN_DIR)/libtcl.a
+$(TK_LIB_NAME):	$(OBJS)
+	rm -f $@
+	ar cr $@ ${OBJS}
+	${RANLIB} $@
+
+wish: tkAppInit.o $(TK_SLIB_NAME)
 	$(CC) $(CC_SWITCHES) tkAppInit.o $(LIBS) -o wish
 
 tktest: tkTest.o libtk.a $(TCL_BIN_DIR)/libtcl.a
@@ -173,11 +205,12 @@
 	@cwd=`pwd`; \
 	cd $(TCL_DIR); TCL_LIBRARY=`pwd`/library; export TCL_LIBRARY; \
 	cd $$cwd; cd $(SRC_DIR); TK_LIBRARY=`pwd`/library; export TK_LIBRARY; \
+	LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH; \
 	cd $$cwd; ( echo cd $(SRC_DIR)/tests\; source all\; exit ) | ./tktest
 
 install: install-binaries install-libraries install-demos install-man
 
-install-binaries: libtk.a wish
+install-binaries: $(TK_SLIB_NAME) $(TK_LIB_NAME) wish
 	@for i in $(LIB_DIR) $(BIN_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
@@ -187,9 +220,9 @@
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing libtk.a"
-	@$(INSTALL_DATA) libtk.a $(LIB_DIR)
-	@$(RANLIB) $(LIB_DIR)/libtk.a
+	@echo "Installing libtk"
+	@$(INSTALL_DATA) $(TK_LIB_NAME) $(LIB_DIR)
+	@$(INSTALL_DATA) $(TK_SLIB_NAME) $(LIB_DIR)
 	@echo "Installing wish"
 	@$(INSTALL_PROGRAM) wish $(BIN_DIR)
 
@@ -279,16 +312,28 @@
 	$(SHELL) config.status
 
 clean:
-	rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors tktest wish
+	rm -f *.o *.core errs *~ \#* TAGS *.E a.out errors tktest wish \
+$(TK_LIB_NAME) $(TK_SLIB_NAME)
 
 distclean: clean
 	rm -f Makefile config.status
 
+.SUFFIXES:
+.SUFFIXES: .o .so .out .po .s .S .c .cc .cxx .m .C .f .y .l
+
 .c.o:
-	$(CC) -c $(CC_SWITCHES) $<
+	$(CC) -c $(CC_SWITCHES) -o $@ $*.c
+.c.so:
+	$(CC) -c $(SCC_SWITCHES) -o $@ $*.c
 
 $(OBJS) tkTest.o: tk.h tkInt.h tkConfig.h
 $(WIDGOBJS): default.h
 $(CANVOBJS): default.h tkCanvas.h
 $(TEXTOBJS): default.h tkText.h
 tkWindow.o: patchlevel.h
+
+$(SOBJS) tkTest.o: tk.h tkInt.h tkConfig.h
+$(SWIDGOBJS): default.h
+$(SCANVOBJS): default.h tkCanvas.h
+$(STEXTOBJS): default.h tkText.h
+tkWindow.so: patchlevel.h