1.1 --- a/src/test/makefile	Thu Apr 29 16:59:00 2004 +0000
     1.2 +++ b/src/test/makefile	Thu Apr 29 17:00:44 2004 +0000
     1.3 @@ -1,18 +1,21 @@
     1.4 -#CXX3 := $(shell type -p g++-3.4 || shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
     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 -CXX2 = g++-2.95
     1.7 -CXX=$(CXX3)
     1.8 +INCLUDEDIRS ?= -I../include
     1.9 +CXXFLAGS += -Wall -O3 -ansi -pedantic $(INCLUDEDIRS) 
    1.10 +#LEDAROOT ?= /ledasrc/LEDA-4.1
    1.11 +
    1.12 +BINARIES = dijkstra_heap_test unionfind_test
    1.13 +
    1.14 +ifdef GCCVER
    1.15 +CXX := g++-$(GCCVER)
    1.16 +else
    1.17 +CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    1.18 +endif
    1.19 +
    1.20  CC=$(CXX)
    1.21 -INCLUDEDIRS ?= -I../include -I.. -I../work/{marci,jacint,alpar,klao,akos,athos} 
    1.22 -CXXFLAGS = -W -Wall -ansi -pedantic -O3 $(INCLUDEDIRS) 
    1.23 -LEDAROOT ?= /ledasrc/LEDA-4.1
    1.24 -
    1.25 -BINARIES = dijkstra_heap_test
    1.26  
    1.27  all: $(BINARIES)
    1.28  
    1.29  .depend dep depend:
    1.30 -	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
    1.31 +	$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend
    1.32  
    1.33  makefile: .depend
    1.34  sinclude .depend