Please enter the commit message for your changes. Lines starting

[eos/base.git] / util / src / TclTk / Makefile

diff --git a/util/src/TclTk/Makefile b/util/src/TclTk/Makefile
index 8cf0e3d..b0dfc8f 100755 (executable)
--- a/util/src/TclTk/Makefile
+++ b/util/src/TclTk/Makefile
@@ -1,6 +1,7 @@
-.SUFFIXES: 
+include ../../Config/Define.inc
+include ../../Config/Target.inc
 
-.IGNORE:
+UTILS=Tcl Tk BLT VTK
 
 SHELL=/bin/ksh
 
@@ -29,9 +30,13 @@ TCLLIBWHERE=http://sourceforge.net/projects/tcllib/files/tcllib/$(TCLLIBVERSION/
 
 ### BLT
 BLTVERSION=2.5.3
+#BLTVERSION=3.2.23
+#BLTNAME=blt-src-$(BLTVERSION)
 BLTNAME=blt-src-$(BLTVERSION)
 BLTNAMEDIR=blt2.5
+#BLTNAMEDIR=wjoye-tkblt-2c9ea39
 BLTWHERE=http://sourceforge.net/projects/wize/files/$(BLTNAME).zip/download
+#BLTWHERE=https://sourceforge.net/projects/tkblt/files/V$(BLTVERSION)/V$(BLTVERSION).tar.gz
 
 ### VTK
 #VTKVERSION1=Nighty
@@ -42,15 +47,10 @@ VTKNAME=VTK-$(VTKVERSION)
 VTKWHERE=http://www.vtk.org/files/release/6.3/
 #VTKWHERE=http://www.vtk.org/files/release/6.2/
 
-check:  TclCheck TkCheck TcllibCheck TkImgCheck BLTCheck VTKCheck
-
-config: TclConfig TkConfig TkImgCheck BLTConfig VTKConfig
-
-all: Tcl Tk TkImg BLT VTK
-
-clean: TclClean TkClean TkImgClean BLTClean VTKClean
-
-cleanAll: TclCleanAll TkCleanAll TkImgCleanAll BLTCleanAll VTKCleanAll
+help::
+       @echo "make tcl"
+       @echo "make tk"
+       @echo "make BLT"
 
 tcl::
        make TclCheck
@@ -93,8 +93,8 @@ TkImgCheck::
 BLTCheck::
        #@ln -s ../../src/TclTk/BLT$(BLTVERSION).tar.gz .
        #@gzip -dc BLT$(BLTVERSION).tar.gz | tar xvf - 
-       curl -L $(BLTWHERE) > $(BLTNAME).zip
-       unzip $(BLTNAME).zip
+       curl -L $(BLTWHERE) > $(BLTNAME).tar.gz
+       tar xvzf $(BLTNAME).tar.gz
 
 TcllibCheck::
        curl -L $(TCLLIBWHERE) > $(TCLLIBNAME).zip
@@ -115,7 +115,7 @@ VTKCheck::
 TclConfig::
        cd tcl$(TCLVERSION)/unix ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
-                           --enable-shared --enable-threads
+                           --enable-shared --enable-threads --enable-symbols
        #./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
        #                   --enable-shared --enable-symbol \
        #                       --enable-threads
@@ -124,7 +124,7 @@ TkConfig::
        cd tk$(TKVERSION)/unix  ; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../../tcl$(TCLVERSION)/unix \
-                               --with-libtiff --enable-symbol --enable-shared \
+                               --with-libtiff --enable-symbol --enable-shared --enable-symbols \
                                --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
 
 TkImgConfig::
@@ -134,9 +134,14 @@ TkImgConfig::
                                --with-tk=${EOS_HOME}/util/src$(OSTYPE)/TclTk/tk$(TKVERSION)/unix  \
 
 BLTConfig::
-       cd $(BLTNAMEDIR); \
-       $(MAKE) clean; \
-       ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
+       #cd $(BLTNAMEDIR); ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
+                               --with-tcl=${EOS_HOME}/util/$(OSTYPE)  \
+                               --with-tk=${EOS_HOME}/util/$(OSTYPE) \
+                               --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
+                               --enable-shared \
+                               --with-cflags="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -DSIZEOF_VOID_P=8" \
+                               --with-x --x-libraries=/opt/X11/lib --x-includes=/opt/X11/include --with-gnu-ld
+       cd $(BLTNAMEDIR) ; ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../tcl$(TCLVERSION)/unix \
                                --with-tk=../tk$(TKVERSION)/unix  \
                                --enable-jpeg=${EOS_HOME}/util/$(OSTYPE) \
@@ -193,7 +198,7 @@ TkImg::
 
 BLTAll::
        @cd $(BLTNAMEDIR); \
-       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT" $(MAKE) install  ; \
+       CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -DSIZEOF_VOID_P=8" $(MAKE) install  ; \
        cp generic/bltOldConfig.h ${EOS_HOME}/util/$(OSTYPE)/include/ ; \
        # $(MAKE) INSTALL=${EOS_HOME}/sbin/eosinstall install 
 
@@ -214,7 +219,7 @@ TclClean::
 
 TclCleanAll::
        @rm -rf tcl$(TCLVERSION) ; 
-       @rm tcl$(TCLVERSION)-src.tar.gz ;
+       @rm -f tcl$(TCLVERSION)-src.tar.gz ;
        #@rm -f tcl$(TCLVERSION)-src.zip ;
 
 TkClean::
@@ -227,7 +232,7 @@ TkCleanAll::
 
 
 BLTClean::
-       @cd blt$(BLTVERSION); \
+       @cd $(BLTNAMEDIR); \
        $(MAKE) distclean
 
 BLTCleanAll::
@@ -246,4 +251,8 @@ VTKClean::
        cd vtk$(VTKVERSION) ; \
        $(MAKE) distclean 
 
+VTKCleanAll::
+       @rm -rf vtk$(VTKVERSION) 
+       @rm -f $(VTKNAME).zip
+