From: Ron F. <ro...@us...> - 2007-06-11 22:00:58
|
Update of /cvsroot/nsclspectcl/SpecTcl/Sorter In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21577/Sorter Modified Files: Tag: SpecTcl-3-1-maintenance Makefile.am Log Message: Get a clean compilation from a cvs co for ubuntu edgy eft (3.1 maint branch) Index: Makefile.am =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Makefile.am,v retrieving revision 5.4 retrieving revision 5.4.2.1 diff -C2 -d -r5.4 -r5.4.2.1 *** Makefile.am 22 Sep 2005 12:40:00 -0000 5.4 --- Makefile.am 11 Jun 2007 22:00:22 -0000 5.4.2.1 *************** *** 2,6 **** -I../Events -I../Display @TCL_FLAGS@ -I.. LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11 ! AM_LDFLAGS = -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@ lib_LTLIBRARIES = libSorting.la --- 2,6 ---- -I../Events -I../Display @TCL_FLAGS@ -I.. LDADD = -lSorting -lXplus -lGates -lAnalysis -lEventSource -ltclPlus -lException -lXamine -lXt -lX11 ! lib_LTLIBRARIES = libSorting.la *************** *** 8,11 **** --- 8,13 ---- -Wl,"-rpath=$(libdir)" + libSorting_la_LIBADD= -L. @TCL_LDFLAGS@ @XTLIBSW@ @XLIBSW@ + libSorting_la_SOURCES = DictionaryException.cpp Histogrammer.cpp Spectrum.cpp \ Spectrum1DL.cpp Spectrum2DW.cpp Spectrum1DW.cpp Spectrum2DB.cpp \ |