XINCLUDE: use /usr/X11R6/include everywhere

[micropolis] / src / tk / makefile

diff --git a/src/tk/makefile b/src/tk/makefile
index 344c37c2f2436200b52e865333784e472f165174..424f95b5b13deed5b783f055e9bcbfd42f1aa737 100644 (file)
--- a/src/tk/makefile
+++ b/src/tk/makefile
@@ -29,11 +29,12 @@
 
 CC             = gcc
 
 
 CC             = gcc
 

-CFLAGS         = -I. -I$(XINCLUDE) -I$(TCL_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
-#CFLAGS                = -I. -I$(XINCLUDE) -I$(TCL_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+CFLAGS         = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+#CFLAGS                = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX

 
 TCL_DIR                = ../tcl
 
 TCL_DIR                = ../tcl

-XINCLUDE       = /usr/include/X11
+TCLX_DIR       = ../tclx/src
+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


@@ -175,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~