1.1 --- a/src/work/marci/makefile	Fri Mar 12 16:37:08 2004 +0000
     1.2 +++ b/src/work/marci/makefile	Fri Mar 12 20:09:35 2004 +0000
     1.3 @@ -1,20 +1,33 @@
     1.4 -CXX3 = g++-3.0
     1.5 +#CXX3 = g++-3.0
     1.6  CXX2 = g++-2.95
     1.7 -CXX3.3 = g++
     1.8 -CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar
     1.9 +#CXX3.3 = g++
    1.10 +CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    1.11 +#CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar
    1.12  LEDAROOT ?= /ledasrc/LEDA-4.1
    1.13 +BOOSTROOT ?= /home/marci/boost
    1.14 +INCLUDEDIRS ?= -I../../include -I.. -I. -I../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I$(BOOSTROOT)
    1.15 +CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic
    1.16  
    1.17 -BINARIES = edmonds_karp_demo edmonds_karp_demo_alpar preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos lg_vs_sg
    1.18 +
    1.19 +BINARIES = edmonds_karp_demo preflow_demo_leda lg_vs_sg leda_graph_demo
    1.20 +#preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar
    1.21  
    1.22  all: $(BINARIES)
    1.23  
    1.24  .depend dep depend:
    1.25 -	-g++-2.95 -I. -I.. -I$(LEDAROOT)/incl -I/home/marci/boost -M *.cc > .depend 2>/dev/null
    1.26 +	-g++ $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    1.27 +
    1.28  
    1.29  
    1.30  makefile: .depend
    1.31  sinclude .depend
    1.32  
    1.33 +leda_graph_demo.o:
    1.34 +	$(CXX3) -Wall -O0 -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
    1.35 +
    1.36 +leda_graph_demo: leda_graph_demo.o
    1.37 +	$(CXX3) -Wall -O0 -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
    1.38 +
    1.39  edmonds_karp_demo: 
    1.40  	$(CXX3) $(CXXFLAGS) -g -I. -I.. -o edmonds_karp_demo edmonds_karp_demo.cc
    1.41  	$(CXX3) $(CXXFLAGS) -g -pg -O3 -I. -I.. -o edmonds_karp_demo_prof edmonds_karp_demo.cc
    1.42 @@ -29,7 +42,7 @@
    1.43  	$(CXX2) -W -Wall -O3 -DLEDA_PREFIX -I. -I$(LEDAROOT)/incl -L$(LEDAROOT) -o preflow_demo_leda preflow_demo_leda.cc -lP -lm -lL -lG
    1.44  
    1.45  preflow_demo_leda_uj:
    1.46 -	$(CXX3.3) -Wall -O3 -I$(LEDAROOT)/incl -I. -L$(LEDAROOT) -o preflow_demo_leda_uj preflow_demo_leda_uj.cc -lG -lL -lm
    1.47 +	$(CXX3) -Wall -O3 -I$(LEDAROOT)/incl -I. -L$(LEDAROOT) -o preflow_demo_leda_uj preflow_demo_leda_uj.cc -lG -lL -lm
    1.48  
    1.49  preflow_demo_boost:
    1.50  	$(CXX2) -ftemplate-depth-30 -O3 -I. -I/home/marci/boost -o preflow_demo_boost preflow_demo_boost.cc