Changeset 4914
- Timestamp:
- Jan 1, 2015 2:52:13 PM (9 years ago)
- Location:
- branches/r9
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/apps/Makefile.in
r4268 r4914 24 24 copy_rappture_examples \ 25 25 encodedata \ 26 $(srcdir)/execute.tcl \ 26 27 $(srcdir)/launcher.tcl \ 27 28 $(srcdir)/mapviewer-test \ -
branches/r9/configure.in
r4912 r4914 315 315 AC_SUBST(RAPPTURE_MINOR_VERSION) 316 316 AC_SUBST(RAPPTURE_RELEASE_SERIAL) 317 317 AC_SUBST(RAPPTURE_VERSION) 318 318 AC_SUBST(WITH_VTK) 319 319 AC_SUBST(WITH_R) -
branches/r9/gui/Makefile.in
r4854 r4914 14 14 MKDIR_P = @MKDIR_P@ 15 15 VPATH = $(srcdir) 16 TCLSH = @TCLSH@16 TCLSH = ${bindir}/tclsh 17 17 18 18 PACKAGE_VERSION = @PACKAGE_VERSION@ -
branches/r9/gui/configure.in
r4867 r4914 14 14 fi 15 15 16 if test -r ${exec_prefix}/lib/rapptureConfig.sh; then 17 . ${exec_prefix}/lib/rapptureConfig.sh 18 PACKAGE_VERSION=$RAPPTURE_VERSION 19 fi 20 16 21 AC_PROG_INSTALL 17 22 AC_PROG_LN_S 18 23 AC_PROG_MKDIR_P 19 24 AC_PROG_MAKE_SET 20 21 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then22 . ${exec_prefix}/lib/tclConfig.sh23 fi24 if test -f "${exec_prefix}/lib/tkConfig.sh" ; then25 . ${exec_prefix}/lib/tkConfig.sh26 fi27 28 TCLSH=${bindir}/tclsh${TCL_VERSION}29 AC_MSG_RESULT([${TCLSH}])30 AC_SUBST(TCLSH)31 25 32 26 AC_CONFIG_FILES([ -
branches/r9/gui/scripts/Makefile.in
r4344 r4914 14 14 INSTALL = @INSTALL@ 15 15 MKDIR_P = @MKDIR_P@ 16 TCLSH = @TCLSH@16 TCLSH = ${bindir}/tclsh 17 17 VPATH = $(srcdir) 18 18 PACKAGE_VERSION = @PACKAGE_VERSION@ -
branches/r9/lang/configure
r4909 r4914 629 629 TCL_SHLIB_LD 630 630 TCL_SHLIB_CFLAGS 631 TCL_LIB_SPEC 632 TCL_INC_SPEC 631 633 TCL_CFLAGS_OPTIMIZE 632 634 TCL_CFLAGS_DEBUG 633 TCL _LIB_SPEC634 TCL_INC_SPEC 635 TCLSH 636 SVN_VERSION 635 637 SIZEOF_VOID_P 636 638 SIZEOF_LONG_LONG … … 641 643 RUBY_PLATFORM 642 644 RP_BASE 645 RAPPTURE_VERSION 646 RAPPTURE_RELEASE_SERIAL 647 RAPPTURE_MINOR_VERSION 648 RAPPTURE_MAJOR_VERSION 643 649 PYTHON_VERSION 644 650 PYTHON_SITE_PACKAGES … … 664 670 OCTAVE_VERSION_MAJOR 665 671 OCTAVE_VERSION 666 SVN_VERSION667 672 MKOCTFILE3 668 673 MKOCTFILE2 … … 712 717 MEX 713 718 MATLAB 714 TCLSH715 719 INSTALL_STUB_LIB 716 720 INSTALL_LIB … … 808 812 enable_corefoundation 809 813 enable_load 810 with_tclsh811 814 with_matlab 812 815 with_octave … … 1467 1470 --with-x use the X Window System 1468 1471 --with-install=DIR location of installation [default=yes] 1469 --with-tclsh=DIR location of tclsh [default=yes]1470 1472 --with-matlab=DIR location of matlab and mex compiler [default=yes] 1471 1473 --with-octave=DIR path of default octave compiler `mkoctfile' … … 7460 7462 7461 7463 7462 SVN_VERSION=`svnversion $srcdir` 7463 7464 make_command="" 7465 for m in "$MAKE" make gmake gnumake ; do 7466 if test "x${m}" != "x" ; then 7467 if ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then 7468 make_command=$m; break; 7469 fi 7470 fi 7471 done 7472 if test "x${make_command}" = "x" ; then 7473 as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5 7474 fi 7475 7476 TCL_VERSION="8.4" 7477 for dir in \ 7478 ${exec_prefix} \ 7479 ${exec_prefix}/lib ; do 7480 tclconfig="${dir}/tclConfig.sh" 7481 if test -f "$tclconfig" ; then 7482 . $tclconfig 7483 break 7484 fi 7485 done 7486 7487 7488 # Check whether --with-tclsh was given. 7489 if test "${with_tclsh+set}" = set; then : 7490 withval=$with_tclsh; 7491 else 7492 with_tclsh=yes 7493 fi 7494 7495 7496 TCLSH="" 7497 if test "${with_tclsh}" != "no" ; then 7498 tclsh="tclsh${TCL_VERSION}" 7499 if test "${with_tclsh}" = "yes" ; then 7500 # Extract the first word of "${tclsh}", so it can be a program name with args. 7501 set dummy ${tclsh}; ac_word=$2 7502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7503 $as_echo_n "checking for $ac_word... " >&6; } 7504 if ${ac_cv_path_TCLSH+:} false; then : 7505 $as_echo_n "(cached) " >&6 7506 else 7507 case $TCLSH in 7508 [\\/]* | ?:[\\/]*) 7509 ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. 7510 ;; 7511 *) 7512 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7513 as_dummy="${exec_prefix}/bin:${PATH}" 7514 for as_dir in $as_dummy 7515 do 7516 IFS=$as_save_IFS 7517 test -z "$as_dir" && as_dir=. 7518 for ac_exec_ext in '' $ac_executable_extensions; do 7519 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7520 ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" 7521 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7522 break 2 7523 fi 7524 done 7525 done 7526 IFS=$as_save_IFS 7527 7528 ;; 7529 esac 7530 fi 7531 TCLSH=$ac_cv_path_TCLSH 7532 if test -n "$TCLSH"; then 7533 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5 7534 $as_echo "$TCLSH" >&6; } 7535 else 7536 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7537 $as_echo "no" >&6; } 7538 fi 7539 7540 7541 else 7542 # Extract the first word of "${tclsh}", so it can be a program name with args. 7543 set dummy ${tclsh}; ac_word=$2 7544 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7545 $as_echo_n "checking for $ac_word... " >&6; } 7546 if ${ac_cv_path_TCLSH+:} false; then : 7547 $as_echo_n "(cached) " >&6 7548 else 7549 case $TCLSH in 7550 [\\/]* | ?:[\\/]*) 7551 ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. 7552 ;; 7553 *) 7554 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7555 as_dummy="${with_tclsh}/bin:${with_tclsh}" 7556 for as_dir in $as_dummy 7557 do 7558 IFS=$as_save_IFS 7559 test -z "$as_dir" && as_dir=. 7560 for ac_exec_ext in '' $ac_executable_extensions; do 7561 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7562 ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" 7563 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7564 break 2 7565 fi 7566 done 7567 done 7568 IFS=$as_save_IFS 7569 7570 ;; 7571 esac 7572 fi 7573 TCLSH=$ac_cv_path_TCLSH 7574 if test -n "$TCLSH"; then 7575 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5 7576 $as_echo "$TCLSH" >&6; } 7577 else 7578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7579 $as_echo "no" >&6; } 7580 fi 7581 7582 7583 fi 7584 if test "x${TCLSH}" = "x" ; then 7585 as_fn_error $? "can't find tclsh" "$LINENO" 5 7586 fi 7464 if test -r "${exec_prefix}/lib/tclConfig.sh" ; then 7465 . ${exec_prefix}/lib/tclConfig.sh 7466 fi 7467 if test -r "${exec_prefix}/lib/tkConfig.sh" ; then 7468 . ${exec_prefix}/lib/tkConfig.sh 7469 fi 7470 if test -r "${exec_prefix}/lib/rapptureConfig.sh" ; then 7471 . ${exec_prefix}/lib/rapptureConfig.sh 7587 7472 fi 7588 7473 … … 9669 9554 9670 9555 MAKE=${make_command} 9556 9557 9558 9559 9671 9560 9672 9561 -
branches/r9/lang/configure.in
r4867 r4914 99 99 SC_CONFIG_CFLAGS 100 100 101 SVN_VERSION=`svnversion $srcdir` 102 103 make_command="" 104 for m in "$MAKE" make gmake gnumake ; do 105 if test "x${m}" != "x" ; then 106 if ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then 107 make_command=$m; break; 108 fi 109 fi 110 done 111 if test "x${make_command}" = "x" ; then 112 AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE]) 113 fi 114 115 TCL_VERSION="8.4" 116 for dir in \ 117 ${exec_prefix} \ 118 ${exec_prefix}/lib ; do 119 tclconfig="${dir}/tclConfig.sh" 120 if test -f "$tclconfig" ; then 121 . $tclconfig 122 break 123 fi 124 done 125 126 AC_ARG_WITH( 127 [tclsh], 128 [AS_HELP_STRING([--with-tclsh[=DIR]], 129 [location of tclsh @<:@default=yes@:>@])], 130 [], 131 [with_tclsh=yes]) 132 133 TCLSH="" 134 if test "${with_tclsh}" != "no" ; then 135 tclsh="tclsh${TCL_VERSION}" 136 if test "${with_tclsh}" = "yes" ; then 137 AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}]) 138 else 139 AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}]) 140 fi 141 if test "x${TCLSH}" = "x" ; then 142 AC_ERROR([can't find tclsh]) 143 fi 101 if test -r "${exec_prefix}/lib/tclConfig.sh" ; then 102 . ${exec_prefix}/lib/tclConfig.sh 103 fi 104 if test -r "${exec_prefix}/lib/tkConfig.sh" ; then 105 . ${exec_prefix}/lib/tkConfig.sh 106 fi 107 if test -r "${exec_prefix}/lib/rapptureConfig.sh" ; then 108 . ${exec_prefix}/lib/rapptureConfig.sh 144 109 fi 145 110 … … 213 178 AC_SUBST(MKOCTFILE2) 214 179 AC_SUBST(MKOCTFILE3) 215 AC_SUBST(SVN_VERSION)216 180 AC_SUBST(OCTAVE_VERSION) 217 181 AC_SUBST(OCTAVE_VERSION_MAJOR) … … 240 204 AC_SUBST(PYTHON_VERSION) 241 205 AC_SUBST(R) 206 AC_SUBST(RAPPTURE_MAJOR_VERSION) 207 AC_SUBST(RAPPTURE_MINOR_VERSION) 208 AC_SUBST(RAPPTURE_RELEASE_SERIAL) 209 AC_SUBST(RAPPTURE_VERSION) 242 210 AC_SUBST(RP_BASE) 243 211 AC_SUBST(RUBY) … … 253 221 AC_SUBST(SIZEOF_VOID_P) 254 222 AC_SUBST(STLIB_LD) 223 AC_SUBST(SVN_VERSION) 255 224 AC_SUBST(TCLSH) 225 AC_SUBST(TCL_CFLAGS_DEBUG) 226 AC_SUBST(TCL_CFLAGS_DEBUG) 227 AC_SUBST(TCL_CFLAGS_OPTIMIZE) 256 228 AC_SUBST(TCL_INC_SPEC) 257 229 AC_SUBST(TCL_LIB_SPEC) 258 AC_SUBST(TCL_CFLAGS_DEBUG) 259 AC_SUBST(TCL_CFLAGS_OPTIMIZE) 230 AC_SUBST(TCL_SHLIB_CFLAGS) 260 231 AC_SUBST(TCL_SHLIB_CFLAGS) 261 232 AC_SUBST(TCL_SHLIB_LD) 233 AC_SUBST(TCL_SHLIB_LD) 262 234 AC_SUBST(TCL_SHLIB_LDFLAGS) 235 AC_SUBST(TCL_SHLIB_LDFLAGS) 236 AC_SUBST(TCL_SHLIB_SUFFIX) 263 237 AC_SUBST(TCL_SHLIB_SUFFIX) 264 238 AC_SUBST(TCL_VERSION) 265 239 AC_SUBST(TCL_VERSION) 266 AC_SUBST(TCL_CFLAGS_DEBUG)267 AC_SUBST(TCL_SHLIB_CFLAGS)268 AC_SUBST(TCL_SHLIB_SUFFIX)269 AC_SUBST(TCL_SHLIB_LD)270 AC_SUBST(TCL_SHLIB_LDFLAGS)271 240 AC_SUBST(XSUBPP) 272 241 -
branches/r9/lang/tcl/Makefile.in
r1944 r4914 9 9 prefix = @prefix@ 10 10 11 destdir = $(libdir)/Rappture$( PACKAGE_VERSION)11 destdir = $(libdir)/Rappture$(VERSION) 12 12 13 PACKAGE_VERSION = @PACKAGE_VERSION@ 14 13 AR = ar 14 CC = @CC@ 15 CFLAGS = @CFLAGS@ 16 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 17 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 18 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 19 CXX = @CXX@ 15 20 INSTALL = @INSTALL@ 16 17 CXX = @CXX@ 18 CC = @CC@ 19 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 20 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 21 STLIB_LD = @STLIB_LD@ 21 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 22 LN_S = @LN_S@ 23 MKDIR_P = @MKDIR_P@ 24 RANLIB = @RANLIB@ 25 VERSION = @RAPPTURE_VERSION@ 26 RM = rm -f 27 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 22 28 SHLIB_LD = @SHLIB_LD@ 23 SHLIB_CFLAGS = @SHLIB_CFLAGS@24 29 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ 25 30 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 26 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 27 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 28 CFLAGS = @CFLAGS@ 29 TCL_VERSION = @TCL_VERSION@ 30 TK_VERSION = @TK_VERSION@ 31 32 RANLIB = @RANLIB@ 33 MKDIR_P = @MKDIR_P@ 34 AR = ar 35 LN_S = @LN_S@ 36 RM = rm -f 31 STLIB_LD = @STLIB_LD@ 37 32 38 33 # The script directory is moved from src/tcl. … … 51 46 $(MAKE) -C src install 52 47 $(MAKE) -C scripts install 53 $(RM) $(bindir)/tclsh54 (cd $(bindir); $(LN_S) tclsh$(TCL_VERSION) tclsh)55 $(RM) $(bindir)/wish56 (cd $(bindir); $(LN_S) wish$(TK_VERSION) wish)57 48 58 49 test: -
branches/r9/lang/tcl/pkgIndex.tcl.in
r4913 r4914 1 1 # This is a duplicate of pkgs/runner/pkgIndex.tcl.in 2 package ifneeded Rappture @ PACKAGE_VERSION@ [format {2 package ifneeded Rappture @RAPPTURE_VERSION@ [format { 3 3 set dir "%s" 4 set version @ PACKAGE_VERSION@4 set version @RAPPTURE_VERSION@ 5 5 lappend auto_path [file join $dir scripts] 6 6 namespace eval Rappture { -
branches/r9/lang/tcl/scripts/Makefile.in
r4869 r4914 10 10 srcdir = @srcdir@ 11 11 12 AR = ar 13 CC = @CC@ 14 CFLAGS = @CFLAGS@ 15 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 16 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 17 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 18 CXX = @CXX@ 12 19 INSTALL = @INSTALL@ 20 INSTALL_DATA = ${INSTALL} -m 644 13 21 INSTALL_PROGRAM = ${INSTALL} -m 755 14 INSTALL_DATA = ${INSTALL} -m 64415 22 INSTALL_SCRIPT = ${INSTALL} 16 TCL_VERSION = @TCL_VERSION@ 17 TCLSH = $(bindir)/tclsh$(TCL_VERSION) 18 VERSION = @PACKAGE_VERSION@ 19 VPATH = $(srcdir) 20 21 CXX = @CXX@ 22 CC = @CC@ 23 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 24 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 23 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 24 MKDIR_P = @MKDIR_P@ 25 RANLIB = @RANLIB@ 26 RM = rm -f 27 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 25 28 SHLIB_LD = @SHLIB_LD@ 26 SHLIB_CFLAGS = @SHLIB_CFLAGS@27 29 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ 28 30 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 29 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 30 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 31 CFLAGS = @CFLAGS@ 32 33 RANLIB = @RANLIB@ 34 MKDIR_P = @MKDIR_P@ 35 AR = ar 36 RM = rm -f 31 TCLSH = $(bindir)/tclsh$(TCL_VERSION) 32 TCL_VERSION = @TCL_VERSION@ 33 VERSION = @RAPPTURE_VERSION@ 34 VPATH = $(srcdir) 37 35 38 36 destdir = $(prefix)/lib/Rappture$(VERSION)/scripts -
branches/r9/lang/tcl/src/Makefile.in
r4867 r4914 10 10 srcdir = @srcdir@ 11 11 12 CC = @CC@ 13 CFLAGS = @CFLAGS@ -fPIC 14 CFLAGS_DEBUG = @CFLAGS_DEBUG@ -Wall 15 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 16 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 17 CXX = @CXX@ 18 INSTALL = @INSTALL@ 19 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 20 MKDIR_P = @MKDIR_P@ 12 21 SHELL = @SHELL@ 13 INSTALL = @INSTALL@ 14 MKDIR_P = @MKDIR_P@ 15 16 CXX = @CXX@ 17 CC = @CC@ 18 CFLAGS_DEBUG = @CFLAGS_DEBUG@ -Wall 19 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 20 STLIB_LD = @STLIB_LD@ 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 21 23 SHLIB_LD = @SHLIB_LD@ 22 SHLIB_CFLAGS = @SHLIB_CFLAGS@23 24 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ 24 25 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 25 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 26 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 27 CFLAGS = @CFLAGS@ -fPIC 28 TCL_VERSION = @TCL_VERSION@ 26 STLIB_LD = @STLIB_LD@ 27 SVN_VERSION = @SVN_VERSION@ 29 28 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 29 VERSION = @RAPPTURE_VERSION@ 30 30 31 31 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 35 35 -I$(includedir) 36 36 37 RAPPTURE_VERSION = @PACKAGE_VERSION@38 SVN_VERSION := $(shell svnversion $(srcdir))39 37 DEFINES = -DSVN_VERSION=\"$(SVN_VERSION)\" \ 40 -DRAPPTURE_VERSION=\"$( RAPPTURE_VERSION)\"38 -DRAPPTURE_VERSION=\"$(VERSION)\" 41 39 42 40 RANLIB = @RANLIB@ … … 60 58 # Not using RpLibraryTclInterface.o \ 61 59 62 name = Rappture$( RAPPTURE_VERSION)60 name = Rappture$(VERSION) 63 61 libname = $(name) 64 62 lib = $(libname)$(SHLIB_SUFFIX) -
branches/r9/pkgs/DxToVtk/Makefile.in
r4912 r4914 74 74 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 75 75 TK_LIB_SPEC = @TK_LIB_SPEC@ 76 VERSION = @RAPPTURE_VERSION@ 76 77 77 78 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 85 86 $(TCL_LIB_SPEC) 86 87 87 version = @RAPPTURE_VERSION@ 88 DEFINES = -DRAPPTURE_VERSION=\"$(version)\" 88 DEFINES = -DRAPPTURE_VERSION=\"$(VERSION)\" 89 89 90 90 RANLIB = @RANLIB@ … … 98 98 RpDxToVtk.o 99 99 100 name = RapptureDxToVtk$( version)100 name = RapptureDxToVtk$(VERSION) 101 101 libname = $(name) 102 102 lib = $(libname)$(SHLIB_SUFFIX) … … 127 127 $(RM) Makefile pkgIndex.tcl *~ 128 128 129 ES = -DRAPPTURE_VERSION=\"$(version)\"130 131 RANLIB = @RANLIB@132 AR = ar133 VPATH = $(srcdir)134 RM = rm -f135 136 CDEBUGFLAGS = -g -Wall137 138 139 OBJS = \140 RpDxToVtk.o141 142 name = RapptureDxToVtk$(version)143 libname = $(name)144 lib = $(libname)$(SHLIB_SUFFIX)145 destdir = $(libdir)/$(name)146 147 .PHONY: all install clean distclean148 149 all: $(lib)150 151 $(lib): $(OBJS)152 $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \153 $(LIB_SEARCH_DIRS) $(LIBS)154 155 install: $(lib)156 $(MKDIR_P) -m 0755 $(destdir)157 $(INSTALL) -m 0555 $(lib) $(destdir)158 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir)159 160 .cpp.o:161 $(CXX) $(CXX_SWITCHES) -c $?162 .c.o:163 $(CC) $(CC_SWITCHES) -c $?164 165 clean:166 $(RM) $(OBJS) $(lib)167 168 distclean: clean169 $(RM) Makefile pkgIndex.tcl *~170 -
branches/r9/pkgs/Makefile.in
r4910 r4914 26 26 placard \ 27 27 readpoints \ 28 runner \ 28 29 squeezer \ 29 30 system -
branches/r9/pkgs/placard/Makefile.in
r4912 r4914 23 23 MKDIR_P = @MKDIR_P@ 24 24 RANLIB = @RANLIB@ 25 RAPPTURE_VERSION= @RAPPTURE_VERSION@26 25 RM = rm -f 27 26 SHELL = @SHELL@ … … 33 32 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 34 33 TK_LIB_SPEC = @TK_LIB_SPEC@ 34 VERSION = @RAPPTURE_VERSION@ 35 35 VPATH = $(srcdir) 36 36 … … 46 46 $(TK_LIB_SPEC) 47 47 48 DEFINES = -DRAPPTURE_VERSION=\"$( RAPPTURE_VERSION)\"48 DEFINES = -DRAPPTURE_VERSION=\"$(VERSION)\" 49 49 50 50 CDEBUGFLAGS = -g -Wall … … 52 52 OBJS = placard.o 53 53 54 name = RapptureCanvasPlacard$( version)54 name = RapptureCanvasPlacard$(VERSION) 55 55 libname = $(name) 56 56 lib = $(libname)$(SHLIB_SUFFIX) -
branches/r9/pkgs/readpoints/Makefile.in
r4912 r4914 22 22 MKDIR_P = @MKDIR_P@ 23 23 RANLIB = @RANLIB@ 24 RAPPTURE_VERSION= @RAPPTURE_VERSION@24 VERSION = @RAPPTURE_VERSION@ 25 25 RM = rm -f 26 26 SHELL = @SHELL@ … … 44 44 $(TK_LIB_SPEC) 45 45 46 DEFINES = -DRAPPTURE_VERSION=\"$( RAPPTURE_VERSION)\"46 DEFINES = -DRAPPTURE_VERSION=\"$(VERSION)\" 47 47 48 48 CDEBUGFLAGS = -g -Wall … … 51 51 readPoints.o 52 52 53 name = RapptureReadPoints$( version)53 name = RapptureReadPoints$(VERSION) 54 54 libname = $(name) 55 55 lib = $(libname)$(SHLIB_SUFFIX) -
branches/r9/pkgs/runner/Makefile.in
r4912 r4914 10 10 srcdir = @srcdir@ 11 11 12 destdir = $(libdir)/Rappture$( RAPPTURE_VERSION)12 destdir = $(libdir)/Rappture$(VERSION) 13 13 14 14 AR = ar … … 24 24 MKDIR_P = @MKDIR_P@ 25 25 RANLIB = @RANLIB@ 26 RAPPTURE_VERSION = @RAPPTURE_VERSION@27 26 RM = rm -f 28 27 SHLIB_CFLAGS = @SHLIB_CFLAGS@ … … 31 30 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 32 31 STLIB_LD = @STLIB_LD@ 32 VERSION = @RAPPTURE_VERSION@ 33 33 34 34 XMLFILES = \ … … 37 37 .PHONY: src scripts 38 38 39 hall:39 all: 40 40 $(MAKE) -C scripts all 41 41 -
branches/r9/pkgs/runner/pkgIndex.tcl.in
r4913 r4914 1 1 # This is a duplicate of lang/tcl/pkgIndex.tcl.in 2 package ifneeded Rappture @ PACKAGE_VERSION@ [format {2 package ifneeded Rappture @RAPPTURE_VERSION@ [format { 3 3 set dir "%s" 4 set version @ PACKAGE_VERSION@4 set version @RAPPTURE_VERSION@ 5 5 lappend auto_path [file join $dir scripts] 6 6 namespace eval Rappture {
Note: See TracChangeset
for help on using the changeset viewer.