diff -r e1055232c670 -r f2c532541730 test/Makefile.am
--- a/test/Makefile.am	Thu Jun 22 15:16:11 2006 +0000
+++ b/test/Makefile.am	Thu Jun 22 18:20:25 2006 +0000
@@ -1,89 +1,87 @@
-AM_CPPFLAGS = -I$(top_srcdir) -fno-inline
-LDADD = $(top_builddir)/lemon/libemon.la
+EXTRA_DIST += \
+	test/preflow_graph.dim \
+	test/dijkstra_test.lgf
 
-EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
+noinst_HEADERS += \
+	test/test_tools.h \
+	test/graph_test.h \
+	test/map_test.h \
+	test/graph_utils_test.h \
+	test/heap_test.h
 
-noinst_HEADERS = \
-	test_tools.h \
-	graph_test.h \
-	map_test.h \
-	graph_utils_test.h \
-	heap_test.h
-
-
-check_PROGRAMS = \
-	all_pairs_shortest_path_test \
-	arborescence_test \
-	bfs_test \
-	bipartite_matching_test \
-	counter_test \
-	dfs_test \
-	dijkstra_test \
-	edge_set_test \
-	graph_adaptor_test \
-	graph_test \
-	graph_utils_test \
-	heap_test \
-	kruskal_test \
-	maps_test \
-	matrix_maps_test \
-	max_matching_test \
-	min_cost_flow_test \
-	path_test \
-	polynomial_test \
-	preflow_test \
-	radix_sort_test \
-	refptr_test \
-	simann_test \
-	suurballe_test \
-	test_tools_fail \
-	test_tools_pass \
-	time_measure_test \
-	ugraph_test \
-	unionfind_test \
-	xy_test
+check_PROGRAMS += \
+	test/all_pairs_shortest_path_test \
+	test/arborescence_test \
+	test/bfs_test \
+	test/bipartite_matching_test \
+	test/counter_test \
+	test/dfs_test \
+	test/dijkstra_test \
+	test/edge_set_test \
+	test/graph_adaptor_test \
+	test/graph_test \
+	test/graph_utils_test \
+	test/heap_test \
+	test/kruskal_test \
+	test/maps_test \
+	test/matrix_maps_test \
+	test/max_matching_test \
+	test/min_cost_flow_test \
+	test/path_test \
+	test/polynomial_test \
+	test/preflow_test \
+	test/radix_sort_test \
+	test/refptr_test \
+	test/simann_test \
+	test/suurballe_test \
+	test/test_tools_fail \
+	test/test_tools_pass \
+	test/time_measure_test \
+	test/ugraph_test \
+	test/unionfind_test \
+	test/xy_test
 
 if HAVE_GLPK
-check_PROGRAMS += lp_test
+check_PROGRAMS += test/lp_test
 else !HAVE_GLPK
 if HAVE_CPLEX
-check_PROGRAMS += lp_test
+check_PROGRAMS += test/lp_test
 endif HAVE_CPLEX
 endif !HAVE_GLPK
 
-TESTS = $(check_PROGRAMS)
-XFAIL_TESTS = test_tools_fail$(EXEEXT)
+TESTS += $(check_PROGRAMS)
+XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
-all_pairs_shortest_path_test_SOURCES = all_pairs_shortest_path_test.cc
-arborescence_test_SOURCES = arborescence_test.cc
-bfs_test_SOURCES = bfs_test.cc
-bipartite_matching_test_SOURCES = bipartite_matching_test.cc
-counter_test_SOURCES = counter_test.cc
-dfs_test_SOURCES = dfs_test.cc
-dijkstra_test_SOURCES = dijkstra_test.cc
-edge_set_test_SOURCES = edge_set_test.cc
-graph_adaptor_test_SOURCES = graph_adaptor_test.cc
-graph_test_SOURCES = graph_test.cc
-graph_utils_test_SOURCES = graph_utils_test.cc
-heap_test_SOURCES = heap_test.cc
-kruskal_test_SOURCES = kruskal_test.cc
-maps_test_SOURCES = maps_test.cc
-matrix_maps_test_SOURCES = matrix_maps_test.cc
-max_matching_test_SOURCES = max_matching_test.cc
-min_cost_flow_test_SOURCES = min_cost_flow_test.cc
-path_test_SOURCES = path_test.cc
-polynomial_test_SOURCES = polynomial_test.cc
-preflow_test_SOURCES = preflow_test.cc
-radix_sort_test_SOURCES = radix_sort_test.cc
-refptr_test_SOURCES = refptr_test.cc
-simann_test_SOURCES = simann_test.cc
-suurballe_test_SOURCES = suurballe_test.cc
-test_tools_fail_SOURCES = test_tools_fail.cc
-test_tools_pass_SOURCES = test_tools_pass.cc
-time_measure_test_SOURCES = time_measure_test.cc
-ugraph_test_SOURCES = ugraph_test.cc
-unionfind_test_SOURCES = unionfind_test.cc
-xy_test_SOURCES = xy_test.cc
+test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc
+test_arborescence_test_SOURCES = test/arborescence_test.cc
+test_bfs_test_SOURCES = test/bfs_test.cc
+test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc
+test_counter_test_SOURCES = test/counter_test.cc
+test_dfs_test_SOURCES = test/dfs_test.cc
+test_dijkstra_test_SOURCES = test/dijkstra_test.cc
+test_edge_set_test_SOURCES = test/edge_set_test.cc
+test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
+test_graph_test_SOURCES = test/graph_test.cc
+test_graph_utils_test_SOURCES = test/graph_utils_test.cc
+test_heap_test_SOURCES = test/heap_test.cc
+test_kruskal_test_SOURCES = test/kruskal_test.cc
+test_maps_test_SOURCES = test/maps_test.cc
+test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
+test_max_matching_test_SOURCES = test/max_matching_test.cc
+test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
+test_path_test_SOURCES = test/path_test.cc
+test_polynomial_test_SOURCES = test/polynomial_test.cc
+test_preflow_test_SOURCES = test/preflow_test.cc
+test_radix_sort_test_SOURCES = test/radix_sort_test.cc
+test_refptr_test_SOURCES = test/refptr_test.cc
+test_simann_test_SOURCES = test/simann_test.cc
+test_suurballe_test_SOURCES = test/suurballe_test.cc
+test_test_tools_fail_SOURCES = test/test_tools_fail.cc
+test_test_tools_pass_SOURCES = test/test_tools_pass.cc
+test_time_measure_test_SOURCES = test/time_measure_test.cc
+test_ugraph_test_SOURCES = test/ugraph_test.cc
+test_unionfind_test_SOURCES = test/unionfind_test.cc
+test_xy_test_SOURCES = test/xy_test.cc
 
-lp_test_SOURCES = lp_test.cc
-lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+test_lp_test_SOURCES = test/lp_test.cc
+test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)