tk/tclx: explicitly declare types

[micropolis] / src / tk / makefile

diff --git a/src/tk/makefile b/src/tk/makefile
index 219063add3a374d43a4e573c0ae5f6911370dffa..424f95b5b13deed5b783f055e9bcbfd42f1aa737 100644 (file)
--- a/src/tk/makefile
+++ b/src/tk/makefile
@@ -34,7 +34,7 @@ CFLAGS                = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -O3 -DTK_VERSION=\"2.3\"
 
 TCL_DIR                = ../tcl
 TCLX_DIR       = ../tclx/src
 
 TCL_DIR                = ../tcl
 TCLX_DIR       = ../tclx/src

-XINCLUDE       = /usr/include/X11
+XINCLUDE       = /usr/X11R6/include

 XLIB           = -L/usr/X11R6/lib -lX11 -lXpm
 
 LIBS = libtk.a $(TCL_DIR)/libtcl.a
 XLIB           = -L/usr/X11R6/lib -lX11 -lXpm
 
 LIBS = libtk.a $(TCL_DIR)/libtcl.a


@@ -176,7 +176,7 @@ libtk.a: $(OBJS)
        ranlib libtk.a
 
 $(TCL_DIR)/libtcl.a:
        ranlib libtk.a
 
 $(TCL_DIR)/libtcl.a:

-       cd $(TCL_DIR); make libtcl.a
+       cd $(TCL_DIR); $(MAKE) libtcl.a

 
 clean:
        touch junk~
 
 clean:
        touch junk~