diff -r d137525538dc -r 3c8801529a1f src/work/marci/makefile --- a/src/work/marci/makefile Mon Apr 26 09:55:31 2004 +0000 +++ b/src/work/marci/makefile Mon Apr 26 10:35:36 2004 +0000 @@ -1,12 +1,13 @@ 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++) +CXX3=$(CXX) #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) -LEDAINCLUDE ?= -I$(LEDAROOT)/incl -CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30 +#LEDAINCLUDE ?= -I$(LEDAROOT)/incl +#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try @@ -30,11 +31,17 @@ leda_graph_demo: leda_graph_demo.o $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm +bipartite_matching_leda.o: + $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc + +bipartite_matching_leda: bipartite_matching_leda.o + $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm + max_bipartite_matching_demo.o: - $(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c max_bipartite_matching_demo.cc + $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c max_bipartite_matching_demo.cc max_bipartite_matching_demo: max_bipartite_matching_demo.o - $(CXX3) -Wall -O -L$(LEDAROOT) -o max_bipartite_matching_demo max_bipartite_matching_demo.o -lG -lL -lm + $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o max_bipartite_matching_demo max_bipartite_matching_demo.o -lG -lL -lm leda_bfs_dfs.o: $(CXX3) -Wall -O -I.. -I../alpar -I$(LEDAROOT)/incl -I. -c leda_bfs_dfs.cc