Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4_trunk/gui/src/Makefile.in

    r4212 r6136  
    2626LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
    2727CFLAGS          = @CFLAGS@ -fPIC
     28TCL_SRC_DIR     = @TCL_SRC_DIR@
    2829TCL_VERSION     = @TCL_VERSION@
    29 TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
    3030TCL_LIB_SPEC    = @TCL_LIB_SPEC@
     31TK_SRC_DIR      = @TK_SRC_DIR@
    3132TK_LIB_SPEC     = @TK_LIB_SPEC@
    32 TK_XLIBSW       = @TK_XLIBSW@
     33TK_XLIBSW       = @TK_XLIBSW@
     34# FIXME: should be using TK_INCLUDES from TEA_PRIVATE_TK_HEADERS
     35TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
    3336VTK_VERSION     = @VTK_VERSION@
    3437VTK_TCL_DIR     = @VTK_TCL_DIR@
     
    9598
    9699RpListbox.o: RpListbox.c
    97         $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $?
     100        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $?
    98101.cc.o:
    99102        $(CXX) $(CXX_SWITCHES) -c $?
Note: See TracChangeset for help on using the changeset viewer.