Changeset 6136 for branches/blt4_trunk/gui/src/Makefile.in

Timestamp:

Mar 17, 2016, 7:56:48 PM (8 years ago)

Author:

dkearney

Message:

removing hardcoded path to tcl/tk source header files
tcl/tk source path is provided by TCL_SRC_DIR and TK_SRC_DIR in configure file
updating parameter lists for RpSqueezer?.c calls to tcl/tk 8.5 functions
updating sidebarframe.tcl widget for blt4

File:

• branches/blt4_trunk/gui/src/Makefile.in (modified) (2 diffs)

branches/blt4_trunk/gui/src/Makefile.in

@@ -26 +26 @@
 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
 CFLAGS          = @CFLAGS@ -fPIC
+TCL_SRC_DIR     = @TCL_SRC_DIR@
 TCL_VERSION     = @TCL_VERSION@
-TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+TK_SRC_DIR      = @TK_SRC_DIR@
 TK_LIB_SPEC     = @TK_LIB_SPEC@
-TK_XLIBSW       = @TK_XLIBSW@
+TK_XLIBSW       = @TK_XLIBSW@
+# FIXME: should be using TK_INCLUDES from TEA_PRIVATE_TK_HEADERS
+TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
 VTK_VERSION     = @VTK_VERSION@
 VTK_TCL_DIR     = @VTK_TCL_DIR@
@@ -95 +98 @@
 
 RpListbox.o: RpListbox.c
-        $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $? 
+        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $? 
 .cc.o:
         $(CXX) $(CXX_SWITCHES) -c $?