diff -r 8aca0af3f30b -r 770cc1f4861f src/work/marci/makefile
--- a/src/work/marci/makefile	Fri Apr 23 21:26:32 2004 +0000
+++ b/src/work/marci/makefile	Sat Apr 24 12:44:41 2004 +0000
@@ -1,7 +1,7 @@
 CXX2 = g++-2.95
-CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
-CXX=$(CXX3)
-CC=$(CXX)
+#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
+#CXX=$(CXX3)
+#CC=$(CXX)
 #LEDAROOT ?= /ledasrc/LEDA-4.1
 BOOSTROOT ?= /home/marci/boost
 INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
@@ -12,16 +12,17 @@
 BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
 
-all: $(BINARIES)
+include ../makefile
+#all: $(BINARIES)
 
-.depend dep depend:
-	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
+#.depend dep depend:
+#	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
 #	-g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
 
 
 
-makefile: .depend
-sinclude .depend
+#makefile: .depend
+#sinclude .depend
 
 leda_graph_demo.o:
 	$(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_graph_demo.cc
@@ -72,7 +73,7 @@
 preflow_demo_athos: 
 	$(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
 
-clean:
-	$(RM) *.o $(BINARIES) .depend
-
-.PHONY: all clean dep depend
+#clean:
+#	$(RM) *.o $(BINARIES) .depend
+#
+#.PHONY: all clean dep depend