Changeset 2742 for branches/blt4/lang

Timestamp:

Dec 27, 2011, 12:41:24 PM (13 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4/lang

Files:

• Makefile.in (modified) (2 diffs)
• tcl/scripts/Makefile.in (modified) (2 diffs)
• tcl/src/Makefile.in (modified) (1 diff)

branches/blt4/lang/Makefile.in

@@ -20 +20 @@
 PYTHON          = @PYTHON_DISTUTILS@
 MEX             = @MEX@
-OCTAVE          = @OCTAVE_VERSION@
-JAVAC           = @JAVAC@
+OCTAVE          = @OCTAVE_VERSION@
+JAVAC           = @JAVAC@
+R               = @R@
 
 # Rappture requires it. We always build a Tcl language API.
@@ -44 +45 @@
   LANGS += java
 endif
+ifneq ($(R),)
+  LANGS += R
+endif
 
-.PHONY: tcl octave matlab perl python ruby java
+.PHONY: tcl octave matlab perl python ruby java R
 
 all:

branches/blt4/lang/tcl/scripts/Makefile.in

@@ -56 +56 @@
                 note \
                 number \
+                periodicelement \
                 phase \
                 string
@@ -80 +81 @@
 
 tclIndex: install-objects install-types install-validations $(FILES)
-        $(TCLSH) $(srcdir)/../tclconfig/mkindex.tcl --srcdir $(srcdir) \
+        $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(srcdir) \
                 --outfile tclIndex
-        $(TCLSH) $(srcdir)/../tclconfig/mkobjects.tcl --srcdir $(srcdir) \
+        $(TCLSH) $(srcdir)/../cf/mkobjects.tcl --srcdir $(srcdir) \
                 $(OBJECTS)
 

branches/blt4/lang/tcl/src/Makefile.in

@@ -51 +51 @@
 LIBS = \
         -L../../../src/core -lrappture \
-        $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++
+        $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++
 
 OBJS = \
         Rappture_Init.o \
+        RpCurses.o \
         RpDaemon.o \
         RpEncodeTclInterface.o \