[Lemon-commits] [lemon_svn] marci: r560 - in hugo/trunk/src/work/marci: . leda

[Lemon SVN]

Author: marci
Date: Mon Apr 26 18:21:36 2004
New Revision: 560

Modified:
   hugo/trunk/src/work/marci/leda/makefile
   hugo/trunk/src/work/marci/makefile

Log:
leda comparison files


Modified: hugo/trunk/src/work/marci/leda/makefile
==============================================================================
--- hugo/trunk/src/work/marci/leda/makefile	(original)
+++ hugo/trunk/src/work/marci/leda/makefile	Mon Apr 26 18:21:36 2004
@@ -5,15 +5,17 @@
 #CC=$(CXX)
 #LEDAROOT ?= /ledasrc/LEDA-4.1
 BOOSTROOT ?= /home/marci/boost
-INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
+INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
+LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
 #LEDAINCLUDE ?= -I$(LEDAROOT)/incl
 #CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
 
-LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
+BINARIES = bipartite_matching_leda
+#LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
+#BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
 
-include ../makefile
+include ../../makefile
 #all: $(BINARIES)
 
 #.depend dep depend:
@@ -31,11 +33,11 @@
 leda_graph_demo: leda_graph_demo.o
 	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
 
-bipartite_matching_leda.o:
-	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-
-bipartite_matching_leda: bipartite_matching_leda.o
-	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
+#bipartite_matching_leda.o:
+#	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
+#
+#bipartite_matching_leda: bipartite_matching_leda.o
+#	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
 
 max_bipartite_matching_demo.o:
 	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Mon Apr 26 18:21:36 2004
@@ -31,11 +31,11 @@
 leda_graph_demo: leda_graph_demo.o
 	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
 
-bipartite_matching_leda.o:
-	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-
-bipartite_matching_leda: bipartite_matching_leda.o
-	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
+#bipartite_matching_leda.o:
+#	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
+#
+#bipartite_matching_leda: bipartite_matching_leda.o
+#	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
 
 max_bipartite_matching_demo.o:
 	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc