*** Makefile.in.orig	Sun Nov 21 23:25:44 1993
--- Makefile.in	Wed Mar  1 17:29:02 1995
***************
*** 26,32 ****
  # override the compiled-in location):
  TK_LIBRARY =	$(prefix)/lib/tk
  
! # Directory in which to install the archive libtk.a:
  LIB_DIR =	$(exec_prefix)/lib
  
  # Directory in which to install the program wish:
--- 26,37 ----
  # override the compiled-in location):
  TK_LIBRARY =	$(prefix)/lib/tk
  
! # 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,62 ****
  # 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.3
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
! TCL_BIN_DIR =	../tcl7.3
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
--- 57,67 ----
  # 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 =	@tcl_include_dir@
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
! 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,79 ****
  # 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
  
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
--- 78,84 ----
  # 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 = -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:
***************
*** 123,128 ****
--- 128,137 ----
  
  
  CC =		@CC@
+ SCC_SWITCHES =	${PICFLAGS} ${CFLAGS} -I${SRC_DIR} -I${TCL_DIR} ${X11_INCLUDES} \
+ ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_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} \
  -DTK_LIBRARY=\"${TK_LIBRARY}\"
***************
*** 131,173 ****
  	tkMenu.o tkMenubutton.o tkMessage.o tkScale.o \
  	tkScrollbar.o
  
  CANVOBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvLine.o \
  	tkCanvPoly.o tkCanvPs.o tkCanvText.o tkCanvWind.o \
  	tkRectOval.o tkTrig.o
  
  TEXTOBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextIndex.o tkTextTag.o
  
  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)
  DEMOPROGS = browse color dialog hello ixset rmt rolodex size square \
  	tcolor timer widget
  
! all: libtk.a wish
  
! libtk.a: $(OBJS)
! 	rm -f libtk.a
! 	ar cr libtk.a $(OBJS)
! 	$(RANLIB) libtk.a
  
! wish: tkAppInit.o libtk.a $(TCL_BIN_DIR)/libtcl.a
  	$(CC) $(CC_SWITCHES) tkAppInit.o $(LIBS) -o wish
  
! tktest: tkTest.o libtk.a $(TCL_BIN_DIR)/libtcl.a
  	${CC} ${CC_SWITCHES} tkTest.o $(LIBS) -o tktest
  
  test: tktest
  	@cwd=`pwd`; \
  	cd $(TCL_DIR); TCL_LIBRARY=`pwd`/library; export TCL_LIBRARY; \
  	cd $$cwd; cd $(SRC_DIR); TK_LIBRARY=`pwd`/library; export TK_LIBRARY; \
  	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
  	@for i in $(LIB_DIR) $(BIN_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
--- 140,204 ----
  	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
+ 
  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)
+ 
+ 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)
+ 
  DEMOPROGS = browse color dialog hello ixset rmt rolodex size square \
  	tcolor timer widget
  
! all: $(TK_LIB_NAME) $(TK_SLIB_NAME) wish
  
! $(TK_SLIB_NAME): $(SOBJS)
! 	ld -Bshareable -Bforcearchive -o $@ ${SOBJS}
  
! $(TK_LIB_NAME):	$(OBJS)
! 	rm -f $@
! 	ar cr $@ ${OBJS}
! 	${RANLIB} $@
! 
! wish: tkAppInit.o $(TK_SLIB_NAME) $(TK_LIB_NAME)
  	$(CC) $(CC_SWITCHES) tkAppInit.o $(LIBS) -o wish
  
! tktest: tkTest.o $(TK_SLIB_NAME)
  	${CC} ${CC_SWITCHES} tkTest.o $(LIBS) -o tktest
  
  test: tktest
  	@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: $(TK_SLIB_NAME) $(TK_LIB_NAME) wish
  	@for i in $(LIB_DIR) $(BIN_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
***************
*** 177,185 ****
  		else true; \
  		fi; \
  	    done;
! 	@echo "Installing libtk.a"
! 	@$(INSTALL_DATA) libtk.a $(LIB_DIR)
! 	@$(RANLIB) $(LIB_DIR)/libtk.a
  	@echo "Installing wish"
  	@$(INSTALL_PROGRAM) wish $(BIN_DIR)
  
--- 208,216 ----
  		else true; \
  		fi; \
  	    done;
! 	@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)
  
***************
*** 269,284 ****
  	$(SHELL) config.status
  
  clean:
! 	rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors tktest wish
  
  distclean: clean
  	rm -f Makefile config.status
  
  .c.o:
! 	$(CC) -c $(CC_SWITCHES) $<
  
  $(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
--- 300,327 ----
  	$(SHELL) config.status
  
  clean:
! 	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) -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