1.1 --- a/src/work/marci/makefile	Mon Apr 26 18:22:34 2004 +0000
     1.2 +++ b/src/work/marci/makefile	Tue Apr 27 08:19:39 2004 +0000
     1.3 @@ -1,29 +1,13 @@
     1.4  CXX2 = g++-2.95
     1.5 -#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
     1.6  CXX3=$(CXX)
     1.7 -#CXX=$(CXX3)
     1.8 -#CC=$(CXX)
     1.9 -#LEDAROOT ?= /ledasrc/LEDA-4.1
    1.10  BOOSTROOT ?= /home/marci/boost
    1.11  INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
    1.12 -#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
    1.13 -#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
    1.14  
    1.15  LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    1.16  BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
    1.17  #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    1.18  
    1.19  include ../makefile
    1.20 -#all: $(BINARIES)
    1.21 -
    1.22 -#.depend dep depend:
    1.23 -#	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    1.24 -#	-g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
    1.25 -
    1.26 -
    1.27 -
    1.28 -#makefile: .depend
    1.29 -#sinclude .depend
    1.30  
    1.31  leda_graph_demo.o:
    1.32  	$(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
    1.33 @@ -31,12 +15,6 @@
    1.34  leda_graph_demo: leda_graph_demo.o
    1.35  	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
    1.36  
    1.37 -#bipartite_matching_leda.o:
    1.38 -#	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
    1.39 -#
    1.40 -#bipartite_matching_leda: bipartite_matching_leda.o
    1.41 -#	$(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
    1.42 -
    1.43  max_bipartite_matching_demo.o:
    1.44  	$(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc
    1.45  
    1.46 @@ -49,16 +27,9 @@
    1.47  leda_bfs_dfs: leda_bfs_dfs.o
    1.48  	$(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
    1.49  
    1.50 -#edmonds_karp_demo: 
    1.51 -#	$(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
    1.52 -#	$(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
    1.53 -
    1.54  gw_vs_not: 
    1.55  	$(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
    1.56  
    1.57 -#lg_vs_sg:
    1.58 -#	$(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
    1.59 -
    1.60  edmonds_karp_demo_alpar: 
    1.61  	$(CXX3) $(CXXFLAGS) -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
    1.62  
    1.63 @@ -80,7 +51,3 @@
    1.64  preflow_demo_athos: 
    1.65  	$(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
    1.66  
    1.67 -#clean:
    1.68 -#	$(RM) *.o $(BINARIES) .depend
    1.69 -#
    1.70 -#.PHONY: all clean dep depend