Ignore:
Timestamp:
Mar 17, 2016 11:11:49 PM (8 years ago)
Author:
ldelgass
Message:

Don't hard-code path to Tcl/Tk? sources (merged by hand from r6136)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/src/Makefile.in

    r4212 r6137  
    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@
     34TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
    3335VTK_VERSION     = @VTK_VERSION@
    3436VTK_TCL_DIR     = @VTK_TCL_DIR@
    … …  
    9597
    9698RpListbox.o: RpListbox.c
    97         $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $?
     99        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $?
    98100.cc.o:
    99101        $(CXX) $(CXX_SWITCHES) -c $?
Note: See TracChangeset for help on using the changeset viewer.