1.1 --- a/src/work/marci/makefile	Fri Apr 23 21:26:32 2004 +0000
     1.2 +++ b/src/work/marci/makefile	Sat Apr 24 12:44:41 2004 +0000
     1.3 @@ -1,7 +1,7 @@
     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 -CXX=$(CXX3)
     1.7 -CC=$(CXX)
     1.8 +#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
     1.9 +#CXX=$(CXX3)
    1.10 +#CC=$(CXX)
    1.11  #LEDAROOT ?= /ledasrc/LEDA-4.1
    1.12  BOOSTROOT ?= /home/marci/boost
    1.13  INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
    1.14 @@ -12,16 +12,17 @@
    1.15  BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test
    1.16  #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    1.17  
    1.18 -all: $(BINARIES)
    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 +#.depend dep depend:
    1.25 +#	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    1.26  #	-g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
    1.27  
    1.28  
    1.29  
    1.30 -makefile: .depend
    1.31 -sinclude .depend
    1.32 +#makefile: .depend
    1.33 +#sinclude .depend
    1.34  
    1.35  leda_graph_demo.o:
    1.36  	$(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
    1.37 @@ -72,7 +73,7 @@
    1.38  preflow_demo_athos: 
    1.39  	$(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
    1.40  
    1.41 -clean:
    1.42 -	$(RM) *.o $(BINARIES) .depend
    1.43 -
    1.44 -.PHONY: all clean dep depend
    1.45 +#clean:
    1.46 +#	$(RM) *.o $(BINARIES) .depend
    1.47 +#
    1.48 +#.PHONY: all clean dep depend