Changeset 483:ce29ae5b2e1b in lemon-0.x for src

Timestamp:

04/29/04 19:00:44 (20 years ago)

Author:

beckerjc

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@640

Message:

UnionFind? moved to include. Test compiles and runs cleanly.

• test/makefile: minor cleanups

Location:

src

Files:

• include/unionfind.h (added)
• test/makefile (modified) (1 diff)
• test/unionfind_test.cc (added)
• work/johanna/Makefile (modified) (1 diff)
• work/johanna/unionfind.h (deleted)
• work/johanna/unionfind_test.cc (deleted)

src/test/makefile

@@ -1 @@
-#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)
+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
+
 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
-
-BINARIES = dijkstra_heap_test
 
 all: $(BINARIES)
 
 .depend dep depend:
-        -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
+        $(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend
 
 makefile: .depend

src/work/johanna/Makefile

@@ -1 @@
-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