Changeset 207
- Timestamp:
- Feb 22, 2006 11:16:19 AM (16 years ago)
- Location:
- trunk/src/tcl
- Files:
-
- 1 added
- 2 deleted
- 13 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/tcl/Makefile.in
r205 r207 11 11 #======================================================================== 12 12 13 lib_BINARIES=$(Rappture Library_LIB_FILE)13 lib_BINARIES=$(Rappture_LIB_FILE) 14 14 BINARIES=$(lib_BINARIES) 15 15 … … 19 19 #======================================================================== 20 20 21 RapptureLibrary_SOURCES = \ 21 Rappture_SOURCES = \ 22 src/Rappture_Init.cc \ 22 23 src/RpLibraryTclInterface.cc 23 SOURCES = $(Rappture Library_SOURCES)24 SOURCES = $(Rappture_SOURCES) 24 25 25 26 #======================================================================== … … 30 31 #======================================================================== 31 32 32 RapptureLibrary_OBJECTS = \ 33 Rappture_OBJECTS = \ 34 Rappture_Init.$(OBJEXT) \ 33 35 RpLibraryTclInterface.$(OBJEXT) 34 OBJECTS = $(Rappture Library_OBJECTS)35 36 #======================================================================== 37 # The substitution of "Rappture Library_LIB_FILE" into the variable name below36 OBJECTS = $(Rappture_OBJECTS) 37 38 #======================================================================== 39 # The substitution of "Rappture_LIB_FILE" into the variable name below 38 40 # let's us refer to the objects for the library without knowing the name 39 41 # of the library in advance. It also lets us use the "$@" variable in … … 42 44 #======================================================================== 43 45 44 Rappture Library_LIB_FILE = @RapptureLibrary_LIB_FILE@45 $(Rappture Library_LIB_FILE)_OBJECTS = $(RapptureLibrary_OBJECTS)46 Rappture_LIB_FILE = @Rappture_LIB_FILE@ 47 $(Rappture_LIB_FILE)_OBJECTS = $(Rappture_OBJECTS) 46 48 47 49 #======================================================================== … … 228 230 # above. 229 231 # 230 # $(Rappture Library_LIB_FILE) should be listed as part of the BINARIES variable232 # $(Rappture_LIB_FILE) should be listed as part of the BINARIES variable 231 233 # at the top of the Makefile. That will ensure that this target is built 232 234 # when you run "make binaries". … … 236 238 #======================================================================== 237 239 238 $(Rappture Library_LIB_FILE): $(RapptureLibrary_OBJECTS)239 -rm -f $(Rappture Library_LIB_FILE)240 $(Rappture_LIB_FILE): $(Rappture_OBJECTS) 241 -rm -f $(Rappture_LIB_FILE) 240 242 @MAKE_LIB@ -lrappture 241 $(RANLIB) $(Rappture Library_LIB_FILE) -lrappture243 $(RANLIB) $(Rappture_LIB_FILE) -lrappture 242 244 243 245 #======================================================================== … … 257 259 #RpRusage.$(OBJEXT): $(srcdir)/src/RpRusage.c 258 260 # $(COMPILE) -c `@CYGPATH@ $(srcdir)/src/RpRusage.c` -o $@ 261 262 Rappture_Init.$(OBJEXT): $(srcdir)/src/Rappture_Init.cc 263 $(COMPILEXX) -c `@CYGPATH@ $(srcdir)/src/Rappture_Init.cc` -o $@ 259 264 260 265 RpLibraryTclInterface.$(OBJEXT): $(srcdir)/src/RpLibraryTclInterface.cc -
trunk/src/tcl/configure
r205 r207 273 273 274 274 ac_unique_file="src/RpLibraryTclInterface.cc" 275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os CYGPATH TCL_INCLUDES TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIBS TCL_DEFS TCL_SHLIB_LD_LIBS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_STUB_LIB_FILE TCL_LIB_SPEC TCL_BUILD_LIB_SPEC TCL_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_SPEC CLEANFILES CC CFLAGS ac_ct_CC CFLAGS_DEBUG CFLAGS_OPTIMIZE STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LDFLAGS TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB Rappture Library_LIB_FILE SHLIB_LD_LIBS TCLSH_PROG PACKAGE VERSION PATCHLEVEL EXACT_VERSION NODOT_VERSION LIBOBJS LTLIBOBJS'275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os CYGPATH TCL_INCLUDES TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIBS TCL_DEFS TCL_SHLIB_LD_LIBS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_STUB_LIB_FILE TCL_LIB_SPEC TCL_BUILD_LIB_SPEC TCL_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_SPEC CLEANFILES CC CFLAGS ac_ct_CC CFLAGS_DEBUG CFLAGS_OPTIMIZE STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LDFLAGS TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB Rappture_LIB_FILE SHLIB_LD_LIBS TCLSH_PROG PACKAGE VERSION PATCHLEVEL EXACT_VERSION NODOT_VERSION LIBOBJS LTLIBOBJS' 276 276 ac_subst_files='' 277 277 … … 1304 1304 #-------------------------------------------------------------------- 1305 1305 1306 PACKAGE=Rappture Library1306 PACKAGE=Rappture 1307 1307 1308 1308 MAJOR_VERSION=1 1309 MINOR_VERSION= 01309 MINOR_VERSION=1 1310 1310 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} 1311 1311 … … 2470 2470 *win32* | *WIN32* | *CYGWIN_NT*) 2471 2471 cat >>confdefs.h <<\_ACEOF 2472 #define BUILD_Rappture GUI12472 #define BUILD_Rappture 1 2473 2473 _ACEOF 2474 2474 … … 4281 4281 s,@MAKE_SHARED_LIB@,$MAKE_SHARED_LIB,;t t 4282 4282 s,@MAKE_STATIC_LIB@,$MAKE_STATIC_LIB,;t t 4283 s,@Rappture Library_LIB_FILE@,$RapptureLibrary_LIB_FILE,;t t4283 s,@Rappture_LIB_FILE@,$Rappture_LIB_FILE,;t t 4284 4284 s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t 4285 4285 s,@TCLSH_PROG@,$TCLSH_PROG,;t t -
trunk/src/tcl/configure.in
r205 r207 24 24 #-------------------------------------------------------------------- 25 25 26 PACKAGE=Rappture Library26 PACKAGE=Rappture 27 27 28 28 MAJOR_VERSION=1 29 MINOR_VERSION= 029 MINOR_VERSION=1 30 30 VERSION=${MAJOR_VERSION}.${MINOR_VERSION} 31 31 … … 205 205 case "`uname -s`" in 206 206 *win32* | *WIN32* | *CYGWIN_NT*) 207 AC_DEFINE(BUILD_Rappture GUI)207 AC_DEFINE(BUILD_Rappture) 208 208 CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch" 209 209 AC_SUBST(CLEANFILES) … … 316 316 #-------------------------------------------------------------------- 317 317 318 AC_SUBST(Rappture Library_LIB_FILE)318 AC_SUBST(Rappture_LIB_FILE) 319 319 AC_SUBST(SHLIB_LD_LIBS) 320 320 -
trunk/src/tcl/init.tcl.in
r205 r207 12 12 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. 13 13 # ====================================================================== 14 proc Rappture Library_init {} {14 proc Rappture_init {} { 15 15 global auto_path 16 16 global rappture_library … … 24 24 25 25 set suffix [info sharedlibextension] 26 set library [file join $dir .. libRappture Library@VERSION@${suffix}]26 set library [file join $dir .. libRappture@VERSION@${suffix}] 27 27 load $library 28 28 … … 32 32 } 33 33 34 package provide Rappture Library@VERSION@35 rename Rappture Library_init ""34 package provide Rappture @VERSION@ 35 rename Rappture_init "" 36 36 } 37 Rappture Library_init37 Rappture_init -
trunk/src/tcl/pkgIndex.tcl.in
r205 r207 1 # this file identifies Rappture Libraryas a Tcl package2 package ifneeded Rappture Library@VERSION@ [list source [file join $dir init.tcl]]1 # this file identifies Rappture as a Tcl package 2 package ifneeded Rappture @VERSION@ [list source [file join $dir init.tcl]] -
trunk/src/tcl/tcl_test.tcl
r205 r207 1 package require Rappture Library1 package require Rappture 2 2 3 3 Rappture::library "rplib_test.xml"
Note: See TracChangeset
for help on using the changeset viewer.