[Nsclspectcl-cvscommits] SpecTcl/Sorter Makefile.am,1.1.2.1,1.1.2.2 Makefile.in,1.1.2.2,1.1.2.3 Spectrum.cpp,4.1,4.1.2.1

[<ve...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/Sorter
In directory sc8-pr-cvs1:/tmp/cvs-serv25929/Sorter

Modified Files:
      Tag: SpecTcl-2-0-001-fix
	Makefile.am Makefile.in Spectrum.cpp 
Log Message:
Added more functionality to the autotools stuff. This revision is known to compile and run on Linux, Tru64, and Cygwin.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile.am	21 Mar 2003 17:21:43 -0000	1.1.2.1
--- Makefile.am	2 May 2003 19:42:52 -0000	1.1.2.2
***************
*** 1,5 ****
! INCLUDES = -I. -I../Utility -I../Exception -I../Xamine -I../Gates -I../Events -I../Display @TCL_FLAGS@
  LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11
! LDFLAGS = -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@
  
  lib_LTLIBRARIES = libSorting.la
--- 1,5 ----
! INCLUDES = -I. -I../Utility -I../Exception -I../Xamine -I../Gates -I../Events -I../Display @TCL_FLAGS@ @WARN_FLAGS@
  LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11
! LDFLAGS = -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@ @LD_EXTRA_FLAGS@
  
  lib_LTLIBRARIES = libSorting.la

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Attic/Makefile.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Makefile.in	26 Mar 2003 21:56:50 -0000	1.1.2.2
--- Makefile.in	2 May 2003 19:42:52 -0000	1.1.2.3
***************
*** 66,74 ****
--- 66,77 ----
  CPP = @CPP@
  CXX = @CXX@
+ CYG_LD_FLAGS = @CYG_LD_FLAGS@
  DLLTOOL = @DLLTOOL@
  ECHO = @ECHO@
  EXEEXT = @EXEEXT@
  F77 = @F77@
+ FIX_LIBTOOL = @FIX_LIBTOOL@
  LD_EXTRA_FLAGS = @LD_EXTRA_FLAGS@
+ LD_TESTFILES = @LD_TESTFILES@
  LEX = @LEX@
  LIBTOOL = @LIBTOOL@
***************
*** 86,89 ****
--- 89,93 ----
  TCL_LDFLAGS = @TCL_LDFLAGS@
  VERSION = @VERSION@
+ WARN_FLAGS = @WARN_FLAGS@
  WCHAR_T_DEF = @WCHAR_T_DEF@
  XINCLUDES = @XINCLUDES@
***************
*** 96,102 ****
  have_convert = @have_convert@
  
! INCLUDES = -I. -I../Utility -I../Exception -I../Xamine -I../Gates -I../Events -I../Display @TCL_FLAGS@
  LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11
! LDFLAGS = -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@
  
  lib_LTLIBRARIES = libSorting.la
--- 100,106 ----
  have_convert = @have_convert@
  
! INCLUDES = -I. -I../Utility -I../Exception -I../Xamine -I../Gates -I../Events -I../Display @TCL_FLAGS@ @WARN_FLAGS@
  LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11
! LDFLAGS = -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@ @LD_EXTRA_FLAGS@
  
  lib_LTLIBRARIES = libSorting.la

Index: Spectrum.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Spectrum.cpp,v
retrieving revision 4.1
retrieving revision 4.1.2.1
diff -C2 -d -r4.1 -r4.1.2.1
*** Spectrum.cpp	2 Jan 2003 17:11:33 -0000	4.1
--- Spectrum.cpp	2 May 2003 19:42:53 -0000	4.1.2.1
***************
*** 307,310 ****
--- 307,314 ----
  #include <iostream.h>
  
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+ 
  static string T("-TRUE-");