[Nsclspectcl-cvscommits] SpecTcl/contrib/scriptable Makefile.am,5.1.2.1,5.1.2.2 scriptable_Makefile.include,5.1,5.1.2.1

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

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

Modified Files:
      Tag: SpecTcl-3-0_developmentreally
	Makefile.am scriptable_Makefile.include 
Log Message:
Debugged scaler analysis software.


Index: scriptable_Makefile.include
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable/scriptable_Makefile.include,v
retrieving revision 5.1
retrieving revision 5.1.2.1
diff -C2 -d -r5.1 -r5.1.2.1
*** scriptable_Makefile.include	29 Nov 2004 16:56:41 -0000	5.1
--- scriptable_Makefile.include	21 Feb 2005 17:31:08 -0000	5.1.2.1
***************
*** 41,44 ****
--- 41,45 ----
  	-ltape               \
  	-lFilter             \
+ 	-lBufferAnalysis     \
  	$(TCLLIBS)           \
  	$(X11LIBS)           \

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable/Makefile.am,v
retrieving revision 5.1.2.1
retrieving revision 5.1.2.2
diff -C2 -d -r5.1.2.1 -r5.1.2.2
*** Makefile.am	21 Dec 2004 17:51:32 -0000	5.1.2.1
--- Makefile.am	21 Feb 2005 17:31:05 -0000	5.1.2.2
***************
*** 5,8 ****
--- 5,9 ----
  	-I@top_srcdir@/EventSource -I@top_srcdir@/Gates \
  	-I@top_srcdir@/SpectrumIO -I@top_srcdir@/Xamine -I@top_srcdir@/SpecTcl \
+ 	-I@top_srcdir@/Analysis \
  	-I@top_srcdir@/Display -I@top_srcdir@/Tape -I@top_srcdir@/Filter \
  	@TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@
***************
*** 70,74 ****
  	-lSorting -lXplus \
  	-lGates -lAnalysis \
! 	-lFilter -lEventSource -lSpecio -ltclPlus -lException -lXamine  \
  	-ltape -lXt -lX11 $(X11EXTRA_LDFLAGS)  $(LD_EXTRA_FLAGS) 
  
--- 71,76 ----
  	-lSorting -lXplus \
  	-lGates -lAnalysis \
! 	-lFilter -lEventSource -lSpecio -ltclPlus -lException -lBufferAnalysis \
! 	-lXamine  \
  	-ltape -lXt -lX11 $(X11EXTRA_LDFLAGS)  $(LD_EXTRA_FLAGS) 
  
***************
*** 78,82 ****
  	-L@top_srcdir@/Display -L@top_srcdir@/Gates -L@top_srcdir@/EventSource \
  	-L@top_srcdir@/Events -L@top_srcdir@/TCL -L@top_srcdir@/NSCLException \
! 	-L@top_srcdir@/Filter -L@top_srcdir@/SpecTcl
  
  #
--- 80,84 ----
  	-L@top_srcdir@/Display -L@top_srcdir@/Gates -L@top_srcdir@/EventSource \
  	-L@top_srcdir@/Events -L@top_srcdir@/TCL -L@top_srcdir@/NSCLException \
! 	-L@top_srcdir@/Filter -L@top_srcdir@/SpecTcl -L@top_srcdir@/Analysis
  
  #
***************
*** 148,151 ****
--- 150,154 ----
  	-L@top_srcdir@/Tape -ltape       \
  	-L@top_srcdir@/Filter -lFilter \
+ 	-L@top_srcdir@/Analysis -lBufferAnalysis \
  	-ltk -ltcl $(MOTIF_LIBSW) $(XLIBSW)  -lXt -lX11 -lm