[Nsclspectcl-cvscommits] SpecTcl/SpecTcl Makefile.am,5.1.2.5,5.1.2.6 SpecTcl_Makefile.include,5.1.2.2,5.1.2.3 TCLAnalyzer.cpp,5.1.2.4,5.1.2.5

[Ron F. <ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/SpecTcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28558/SpecTcl

Modified Files:
      Tag: SpecTcl-3-0_developmentreally
	Makefile.am SpecTcl_Makefile.include TCLAnalyzer.cpp 
Log Message:
Backporting to g++-2.95 and debugging TreeParameter.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/Makefile.am,v
retrieving revision 5.1.2.5
retrieving revision 5.1.2.6
diff -C2 -d -r5.1.2.5 -r5.1.2.6
*** Makefile.am	17 Mar 2005 13:40:46 -0000	5.1.2.5
--- Makefile.am	15 Apr 2005 20:30:46 -0000	5.1.2.6
***************
*** 80,87 ****
  SpecTcl_LDADD = -lTclGrammerCommands -lSorting -lXplus -lGates -lAnalysis \
  	-lFilter -lBufferAnalysis -lEventSource -lSpecio -ltclPlus \
! 	-lException -lXamine  -ltape -lXt -lX11 $(X11EXTRA_LDFLAGS)  $(LD_EXTRA_FLAGS)
  SpecTcl_LDFLAGS = -L. @TCL_LDFLAGS@ @XLIBSW@ -L../SpectrumIO -L../Tape -L../Sorter \
  	-L../Xamine -L../Display -L../Gates -L../EventSource -L../Events \
! 	-L../TCL -L../NSCLException -L../Filter -L../Analysis
  
  man_MANS = spectclapi.3
--- 80,88 ----
  SpecTcl_LDADD = -lTclGrammerCommands -lSorting -lXplus -lGates -lAnalysis \
  	-lFilter -lBufferAnalysis -lEventSource -lSpecio -ltclPlus \
! 	-lException -lTreeParam -lXamine  -ltape \
! 	-lXt -lX11 $(X11EXTRA_LDFLAGS)  $(LD_EXTRA_FLAGS)
  SpecTcl_LDFLAGS = -L. @TCL_LDFLAGS@ @XLIBSW@ -L../SpectrumIO -L../Tape -L../Sorter \
  	-L../Xamine -L../Display -L../Gates -L../EventSource -L../Events \
! 	-L../TCL -L../NSCLException -L../Filter -L../Analysis -L../TreeParam
  
  man_MANS = spectclapi.3

Index: TCLAnalyzer.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/TCLAnalyzer.cpp,v
retrieving revision 5.1.2.4
retrieving revision 5.1.2.5
diff -C2 -d -r5.1.2.4 -r5.1.2.5
*** TCLAnalyzer.cpp	17 Mar 2005 13:40:46 -0000	5.1.2.4
--- TCLAnalyzer.cpp	15 Apr 2005 20:30:46 -0000	5.1.2.5
***************
*** 298,302 ****
  #include <buftypes.h>
  #include <Iostream.h>
! 
  #include <stdio.h>
  
--- 298,302 ----
  #include <buftypes.h>
  #include <Iostream.h>
! #include <algorithm>
  #include <stdio.h>
  

Index: SpecTcl_Makefile.include
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/SpecTcl_Makefile.include,v
retrieving revision 5.1.2.2
retrieving revision 5.1.2.3
diff -C2 -d -r5.1.2.2 -r5.1.2.3
*** SpecTcl_Makefile.include	21 Mar 2005 17:56:20 -0000	5.1.2.2
--- SpecTcl_Makefile.include	15 Apr 2005 20:30:46 -0000	5.1.2.3
***************
*** 17,21 ****
  #  Build up the compilation flags:
  
! CXXFLAGS=-g -fno-elide-constructors -I. -I$(SPECINCS) $(TCLINCLUDES)
  
  # The c compilation flags for now are just the same as the c++ flags:
--- 17,21 ----
  #  Build up the compilation flags:
  
! CXXFLAGS=-g  -I. -I$(SPECINCS) $(TCLINCLUDES)
  
  # The c compilation flags for now are just the same as the c++ flags:
***************
*** 38,41 ****
--- 38,42 ----
  	-lFilter      \
  	-lBufferAnalysis \
+ 	-lTreeParam \
  	$(TCLLIBS)    \
  	$(X11LIBS)    \