[med-svn] r46 - trunk/packages/probcons/trunk

[Charles Plessy]

Author: charles-guest
Date: 2006-06-04 15:18:02 +0000 (Sun, 04 Jun 2006)
New Revision: 46

Modified:
   trunk/packages/probcons/trunk/Makefile
Log:
Reverting to a dpatch deapplyed Makefile.

Modified: trunk/packages/probcons/trunk/Makefile
===================================================================
--- trunk/packages/probcons/trunk/Makefile	2006-06-04 15:13:27 UTC (rev 45)
+++ trunk/packages/probcons/trunk/Makefile	2006-06-04 15:18:02 UTC (rev 46)
@@ -16,7 +16,6 @@
 ################################################################################
 
 OTHERFLAGS = -DNumInsertStates=2 -DVERSION="1.10"
-OTHERFLAGS-RNA = -DNumInsertStates=1 -DVERSION="1.10"
 
 # debug mode    
 #CXXFLAGS = -g -W -Wall -pedantic -DENABLE_CHECKS -fno-inline $(OTHERFLAGS)
@@ -26,16 +25,13 @@
 
 # release mode
 #CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -mmmx -msse -msse2 -mfpmath=sse -march=pentium4 -mcpu=pentium4 -funroll-loops -fomit-frame-pointer 
-
 CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -funroll-loops
-CXXFLAGS-RNA = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS-RNA) -funroll-loops
 
-
 ################################################################################
 # 3) Dependencies
 ################################################################################
 
-TARGETS = probcons probcons-RNA pc-compare pc-project pc-makegnuplot
+TARGETS = probcons compare project makegnuplot
 
 .PHONY : all
 all : $(TARGETS)
@@ -43,20 +39,17 @@
 probcons : MultiSequence.h ProbabilisticModel.h ScoreType.h Sequence.h FileBuffer.h SparseMatrix.h EvolutionaryTree.h Defaults.h SafeVector.h Main.cc
 	$(CXX) $(CXXFLAGS) -lm -o probcons Main.cc 
 
-pc-compare : MultiSequence.h Sequence.h FileBuffer.h SafeVector.h CompareToRef.cc
-	$(CXX) $(CXXFLAGS) -o pc-compare CompareToRef.cc
+compare : MultiSequence.h Sequence.h FileBuffer.h SafeVector.h CompareToRef.cc
+	$(CXX) $(CXXFLAGS) -o compare CompareToRef.cc
 
-probcons-RNA : MultiSequence.h ProbabilisticModel.h ScoreType.h Sequence.h FileBuffer.h SparseMatrix.h EvolutionaryTree.h Defaults-RNA.h SafeVector.h Main-RNA.cc
-	$(CXX) $(CXXFLAGS-RNA) -lm -o probcons-RNA Main-RNA.cc 
-
 fixref : MultiSequence.h ProbabilisticModel.h ScoreType.h Sequence.h FileBuffer.h SparseMatrix.h EvolutionaryTree.h Defaults.h SafeVector.h FixRef.cc
 	$(CXX) $(CXXFLAGS) -o fixref FixRef.cc
 
-pc-project : MultiSequence.h Sequence.h SafeVector.h ProjectPairwise.cc
-	$(CXX) $(CXXFLAGS) -o pc-project ProjectPairwise.cc
+project : MultiSequence.h Sequence.h SafeVector.h ProjectPairwise.cc
+	$(CXX) $(CXXFLAGS) -o project ProjectPairwise.cc
 
-pc-makegnuplot : MakeGnuPlot.cc
-	$(CXX) $(CXXFLAGS) -o pc-makegnuplot MakeGnuPlot.cc
+makegnuplot : MakeGnuPlot.cc
+	$(CXX) $(CXXFLAGS) -o makegnuplot MakeGnuPlot.cc
 
 .PHONY : clean
 clean: