[Lemon-commits] [lemon_svn] beckerjc: r640 - in hugo/trunk/src: include test work/johanna

[Lemon SVN]

Author: beckerjc
Date: Thu Apr 29 19:00:44 2004
New Revision: 640

Added:
   hugo/trunk/src/include/unionfind.h
      - copied unchanged from r638, /hugo/trunk/src/work/johanna/unionfind.h
   hugo/trunk/src/test/unionfind_test.cc
      - copied unchanged from r638, /hugo/trunk/src/work/johanna/unionfind_test.cc
Removed:
   hugo/trunk/src/work/johanna/unionfind.h
   hugo/trunk/src/work/johanna/unionfind_test.cc
Modified:
   hugo/trunk/src/test/   (props changed)
   hugo/trunk/src/test/makefile
   hugo/trunk/src/work/johanna/   (props changed)
   hugo/trunk/src/work/johanna/Makefile

Log:
UnionFind moved to include. Test compiles and runs cleanly.

* test/makefile:
  minor cleanups


Modified: hugo/trunk/src/test/makefile
==============================================================================
--- hugo/trunk/src/test/makefile	(original)
+++ hugo/trunk/src/test/makefile	Thu Apr 29 19:00:44 2004
@@ -1,18 +1,21 @@
-#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++)
-CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
-CXX2 = g++-2.95
-CXX=$(CXX3)
-CC=$(CXX)
-INCLUDEDIRS ?= -I../include -I.. -I../work/{marci,jacint,alpar,klao,akos,athos} 
-CXXFLAGS = -W -Wall -ansi -pedantic -O3 $(INCLUDEDIRS) 
-LEDAROOT ?= /ledasrc/LEDA-4.1
+INCLUDEDIRS ?= -I../include
+CXXFLAGS += -Wall -O3 -ansi -pedantic $(INCLUDEDIRS) 
+#LEDAROOT ?= /ledasrc/LEDA-4.1
+
+BINARIES = dijkstra_heap_test unionfind_test
+
+ifdef GCCVER
+CXX := g++-$(GCCVER)
+else
+CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
+endif
 
-BINARIES = dijkstra_heap_test
+CC=$(CXX)
 
 all: $(BINARIES)
 
 .depend dep depend:
-	-$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
+	$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend
 
 makefile: .depend
 sinclude .depend

Modified: hugo/trunk/src/work/johanna/Makefile
==============================================================================
--- hugo/trunk/src/work/johanna/Makefile	(original)
+++ hugo/trunk/src/work/johanna/Makefile	Thu Apr 29 19:00:44 2004
@@ -1,4 +1,4 @@
-BINARIES = kruskal_test ma_order_test unionfind_test
+BINARIES = kruskal_test ma_order_test
 INCLUDEDIRS= -I. -I.. -I../../include -I../{marci,jacint,alpar,klao,akos}
 include ../makefile