1.1 --- a/src/work/marci/leda/makefile	Mon Apr 26 16:08:46 2004 +0000
     1.2 +++ b/src/work/marci/leda/makefile	Mon Apr 26 16:21:36 2004 +0000
     1.3 @@ -5,15 +5,17 @@
     1.4  #CC=$(CXX)
     1.5  #LEDAROOT ?= /ledasrc/LEDA-4.1
     1.6  BOOSTROOT ?= /home/marci/boost
     1.7 -INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
     1.8 +INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
     1.9 +LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
    1.10  #LEDAINCLUDE ?= -I$(LEDAROOT)/incl
    1.11  #CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
    1.12  
    1.13 -LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    1.14 -BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
    1.15 +BINARIES = bipartite_matching_leda
    1.16 +#LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    1.17 +#BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
    1.18  #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    1.19  
    1.20 -include ../makefile
    1.21 +include ../../makefile
    1.22  #all: $(BINARIES)
    1.23  
    1.24  #.depend dep depend:
    1.25 @@ -31,11 +33,11 @@
    1.26  leda_graph_demo: leda_graph_demo.o
    1.27  	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
    1.28  
    1.29 -bipartite_matching_leda.o:
    1.30 -	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    1.31 -
    1.32 -bipartite_matching_leda: bipartite_matching_leda.o
    1.33 -	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    1.34 +#bipartite_matching_leda.o:
    1.35 +#	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    1.36 +#
    1.37 +#bipartite_matching_leda: bipartite_matching_leda.o
    1.38 +#	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    1.39  
    1.40  max_bipartite_matching_demo.o:
    1.41  	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc

     2.1 --- a/src/work/marci/makefile	Mon Apr 26 16:08:46 2004 +0000
     2.2 +++ b/src/work/marci/makefile	Mon Apr 26 16:21:36 2004 +0000
     2.3 @@ -31,11 +31,11 @@
     2.4  leda_graph_demo: leda_graph_demo.o
     2.5  	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
     2.6  
     2.7 -bipartite_matching_leda.o:
     2.8 -	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
     2.9 -
    2.10 -bipartite_matching_leda: bipartite_matching_leda.o
    2.11 -	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    2.12 +#bipartite_matching_leda.o:
    2.13 +#	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    2.14 +#
    2.15 +#bipartite_matching_leda: bipartite_matching_leda.o
    2.16 +#	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    2.17  
    2.18  max_bipartite_matching_demo.o:
    2.19  	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc