[Lemon-commits] [lemon_svn] ladanyi: r2802 - in hugo/trunk: . benchmark demo doc lemon test
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:55:21 CET 2006
Author: ladanyi
Date: Thu Jun 22 20:20:25 2006
New Revision: 2802
Added:
hugo/trunk/benchmark/Makefile
hugo/trunk/demo/Makefile
hugo/trunk/doc/Makefile
hugo/trunk/lemon/Makefile
hugo/trunk/test/Makefile
Modified:
hugo/trunk/Makefile.am
hugo/trunk/benchmark/Makefile.am
hugo/trunk/configure.ac
hugo/trunk/demo/Makefile.am
hugo/trunk/doc/Makefile.am
hugo/trunk/lemon/Makefile.am
hugo/trunk/test/Makefile.am
hugo/trunk/test/heap_test.cc
hugo/trunk/test/preflow_test.cc
Log:
Single makefile.
Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am (original)
+++ hugo/trunk/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,5 +1,8 @@
ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -I$(top_srcdir)
+LDADD = $(top_builddir)/lemon/libemon.la
+
EXTRA_DIST = \
LICENSE \
lemon.spec \
@@ -7,17 +10,26 @@
m4/lx_check_cplex.m4 \
m4/lx_check_glpk.m4
-if WANT_DOC
- MAYBE_DOC = doc
-endif
-if WANT_DEMO
- MAYBE_DEMO = demo
-endif
-if WANT_BENCHMARK
- MAYBE_BENCHMARK = benchmark
-endif
-
-SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
+pkgconfigdir = $(libdir)/pkgconfig
+lemondir = $(pkgincludedir)
+bitsdir = $(lemondir)/bits
+conceptdir = $(lemondir)/concept
+pkgconfig_DATA =
+lib_LTLIBRARIES =
+lemon_HEADERS =
+bits_HEADERS =
+concept_HEADERS =
+noinst_HEADERS =
+noinst_PROGRAMS =
+check_PROGRAMS =
+TESTS =
+XFAIL_TESTS =
+
+include lemon/Makefile.am
+include test/Makefile.am
+include doc/Makefile.am
+include demo/Makefile.am
+include benchmark/Makefile.am
MRPROPERFILES = \
aclocal.m4 \
@@ -39,16 +51,6 @@
benchmark/Makefile.in \
demo/Makefile.in
-doc-clean:
- $(MAKE) -C doc $(AM_MAKEFLAGS) clean html
-
-doc:
- -rm -f doc/html/index.html
- $(MAKE) -C doc $(AM_MAKEFLAGS) html
-
-benchmark:
- $(MAKE) -C benchmark $(AM_MAKEFLAGS)
-
mrproper:
$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
-rm -f $(MRPROPERFILES)
@@ -68,4 +70,4 @@
zcat $(PACKAGE)-$(VERSION).tar.gz | \
bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-.PHONY: doc benchmark mrproper deb rpm dist-bz2 distcheck-bz2
+.PHONY: mrproper deb rpm dist-bz2 distcheck-bz2
Added: hugo/trunk/benchmark/Makefile
==============================================================================
--- (empty file)
+++ hugo/trunk/benchmark/Makefile Thu Jun 22 20:20:25 2006
@@ -0,0 +1,2 @@
+all:
+ $(MAKE) -C ..
Modified: hugo/trunk/benchmark/Makefile.am
==============================================================================
--- hugo/trunk/benchmark/Makefile.am (original)
+++ hugo/trunk/benchmark/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,21 +1,23 @@
-AM_CPPFLAGS = -I$(top_srcdir)
+noinst_HEADERS += benchmark/bench_tools.h
-noinst_HEADERS = bench_tools.h
+if WANT_BENCHMARK
-noinst_PROGRAMS = \
- graph-bench \
- hcube \
- swap_bipartite_bench \
- bfs-bench \
- radix_sort-bench \
- swap_bipartite_bench
+noinst_PROGRAMS += \
+ benchmark/graph-bench \
+ benchmark/hcube \
+ benchmark/swap_bipartite_bench \
+ benchmark/bfs-bench \
+ benchmark/radix_sort-bench \
+ benchmark/swap_bipartite_bench
-graph_bench_SOURCES = graph-bench.cc
+endif WANT_BENCHMARK
-hcube_SOURCES = hcube.cc
+benchmark_graph_bench_SOURCES = benchmark/graph-bench.cc
-bfs_bench_SOURCES = bfs-bench.cc
+benchmark_hcube_SOURCES = benchmark/hcube.cc
-radix_sort_bench_SOURCES = radix_sort-bench.cc
+benchmark_bfs_bench_SOURCES = benchmark/bfs-bench.cc
-swap_bipartite_bench_SOURCES = swap_bipartite_bench.cc
+benchmark_radix_sort_bench_SOURCES = benchmark/radix_sort-bench.cc
+
+benchmark_swap_bipartite_bench_SOURCES = benchmark/swap_bipartite_bench.cc
Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac (original)
+++ hugo/trunk/configure.ac Thu Jun 22 20:20:25 2006
@@ -3,8 +3,7 @@
AC_INIT([LEMON], [svn-head], [etik-ol at cs.elte.hu], [lemon])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AM_INIT_AUTOMAKE([-Wall foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CONFIG_SRCDIR([lemon/list_graph.h])
AC_CONFIG_HEADERS([config.h lemon/config.h])
@@ -98,13 +97,8 @@
Makefile
lemon.spec
autopackage/default.apspec
-doc/Makefile
doc/Doxyfile
-lemon/Makefile
lemon/lemon.pc
-benchmark/Makefile
-demo/Makefile
-test/Makefile
])
AC_OUTPUT
Added: hugo/trunk/demo/Makefile
==============================================================================
--- (empty file)
+++ hugo/trunk/demo/Makefile Thu Jun 22 20:20:25 2006
@@ -0,0 +1,2 @@
+all:
+ $(MAKE) -C ..
Modified: hugo/trunk/demo/Makefile.am
==============================================================================
--- hugo/trunk/demo/Makefile.am (original)
+++ hugo/trunk/demo/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,74 +1,74 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-LDADD = $(top_builddir)/lemon/libemon.la
+EXTRA_DIST += demo/sub_graph_adaptor_demo.dim
-EXTRA_DIST = sub_graph_adaptor_demo.dim
+if WANT_DEMO
-noinst_PROGRAMS = \
- dim_to_dot \
- dijkstra_demo \
- reader_writer_demo \
- dim_to_lgf \
- eps_demo \
- graph_to_eps_demo \
- graph_orientation \
- min_route \
- hello_lemon \
- sub_graph_adaptor_demo \
- descriptor_map_demo \
- coloring \
- grid_ugraph_demo \
- topology_demo \
- simann_maxcut_demo \
- disjoint_paths_demo \
- strongly_connected_orientation
+noinst_PROGRAMS += \
+ demo/dim_to_dot \
+ demo/dijkstra_demo \
+ demo/reader_writer_demo \
+ demo/dim_to_lgf \
+ demo/eps_demo \
+ demo/graph_to_eps_demo \
+ demo/graph_orientation \
+ demo/min_route \
+ demo/hello_lemon \
+ demo/sub_graph_adaptor_demo \
+ demo/descriptor_map_demo \
+ demo/coloring \
+ demo/grid_ugraph_demo \
+ demo/topology_demo \
+ demo/simann_maxcut_demo \
+ demo/disjoint_paths_demo \
+ demo/strongly_connected_orientation
if HAVE_GLPK
-noinst_PROGRAMS += lp_demo lp_maxflow_demo
+noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
else !HAVE_GLPK
if HAVE_CPLEX
-noinst_PROGRAMS += lp_demo lp_maxflow_demo
+noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
endif HAVE_CPLEX
endif !HAVE_GLPK
+endif WANT_DEMO
-dim_to_dot_SOURCES = dim_to_dot.cc
+demo_dim_to_dot_SOURCES = demo/dim_to_dot.cc
-dijkstra_demo_SOURCES = dijkstra_demo.cc
+demo_dijkstra_demo_SOURCES = demo/dijkstra_demo.cc
-eps_demo_SOURCES = eps_demo.cc
+demo_eps_demo_SOURCES = demo/eps_demo.cc
-reader_writer_demo_SOURCES = reader_writer_demo.cc
+demo_reader_writer_demo_SOURCES = demo/reader_writer_demo.cc
-dim_to_lgf_SOURCES = dim_to_lgf.cc
+demo_dim_to_lgf_SOURCES = demo/dim_to_lgf.cc
-coloring_SOURCES = coloring.cc
+demo_coloring_SOURCES = demo/coloring.cc
-graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
+demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
-grid_ugraph_demo_SOURCES = grid_ugraph_demo.cc
+demo_grid_ugraph_demo_SOURCES = demo/grid_ugraph_demo.cc
-graph_orientation_SOURCES = graph_orientation.cc
+demo_graph_orientation_SOURCES = demo/graph_orientation.cc
-min_route_SOURCES = min_route.cc
+demo_min_route_SOURCES = demo/min_route.cc
-hello_lemon_SOURCES = hello_lemon.cc
+demo_hello_lemon_SOURCES = demo/hello_lemon.cc
-sub_graph_adaptor_demo_SOURCES = \
- sub_graph_adaptor_demo.cc \
- tight_edge_filter_map.h
+demo_sub_graph_adaptor_demo_SOURCES = \
+ demo/sub_graph_adaptor_demo.cc \
+ demo/tight_edge_filter_map.h
-lp_demo_SOURCES = lp_demo.cc
-lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+demo_lp_demo_SOURCES = demo/lp_demo.cc
+demo_lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
-lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
-lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+demo_lp_maxflow_demo_SOURCES = demo/lp_maxflow_demo.cc
+demo_lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
-descriptor_map_demo_SOURCES = descriptor_map_demo.cc
+demo_descriptor_map_demo_SOURCES = demo/descriptor_map_demo.cc
-topology_demo_SOURCES = topology_demo.cc
+demo_topology_demo_SOURCES = demo/topology_demo.cc
-simann_maxcut_demo_SOURCES = simann_maxcut_demo.cc
+demo_simann_maxcut_demo_SOURCES = demo/simann_maxcut_demo.cc
-disjoint_paths_demo_SOURCES = disjoint_paths_demo.cc
+demo_disjoint_paths_demo_SOURCES = demo/disjoint_paths_demo.cc
-strongly_connected_orientation_SOURCES = strongly_connected_orientation.cc
\ No newline at end of file
+demo_strongly_connected_orientation_SOURCES = demo/strongly_connected_orientation.cc
Added: hugo/trunk/doc/Makefile
==============================================================================
--- (empty file)
+++ hugo/trunk/doc/Makefile Thu Jun 22 20:20:25 2006
@@ -0,0 +1,2 @@
+all:
+ $(MAKE) -C ..
Modified: hugo/trunk/doc/Makefile.am
==============================================================================
--- hugo/trunk/doc/Makefile.am (original)
+++ hugo/trunk/doc/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,50 +1,66 @@
htmldir = $(datadir)/doc/$(PACKAGE)/html
-EXTRA_DIST = \
- html \
- icons/geom/ftv2doc.png \
- icons/geom/ftv2folderclosed.png \
- icons/geom/ftv2folderopen.png \
- coding_style.dox \
- developers_interface.dox \
- dirs.dox \
- getstart.dox \
- graph-adaptors.dox \
- graph_io.dox \
- graphs.dox \
- groups.dox \
- license.dox \
- mainpage.dox \
- maps.dox \
- named-param.dox \
- namespaces.dox \
- quicktour.dox \
- ugraphs.dox
+EXTRA_DIST += \
+ doc/html \
+ doc/icons/geom/ftv2doc.png \
+ doc/icons/geom/ftv2folderclosed.png \
+ doc/icons/geom/ftv2folderopen.png \
+ doc/coding_style.dox \
+ doc/developers_interface.dox \
+ doc/dirs.dox \
+ doc/getstart.dox \
+ doc/graph-adaptors.dox \
+ doc/graph_io.dox \
+ doc/graphs.dox \
+ doc/groups.dox \
+ doc/license.dox \
+ doc/mainpage.dox \
+ doc/maps.dox \
+ doc/named-param.dox \
+ doc/namespaces.dox \
+ doc/quicktour.dox \
+ doc/ugraphs.dox
-html/index.html:
+doc:
if test ${doxygen_found} = yes; then \
+ cd doc; \
doxygen Doxyfile; \
- cp $(srcdir)/icons/geom/ftv2* html; \
+ cd ..; \
+ cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
fi
-html: html/index.html
+doc-clean:
+ if test ${doxygen_found} = yes; then \
+ rm -rf doc/html; \
+ rm -f doc/doxygen.log; \
+ cd doc; \
+ doxygen Doxyfile; \
+ cd ..; \
+ cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
+ fi
clean-local:
- -rm -rf html
+ -rm -rf doc/html
+ -rm -f doc/doxygen.log
-install-data-local: html/index.html
+doc/html:
+ $(MAKE) $(AM_MAKEFLAGS) doc-clean
+
+install-data-local: doc/html
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(htmldir)
- @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+ @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
done
-uninstall-local: html/index.html
+uninstall-local: doc/html
@$(NORMAL_UNINSTALL)
- @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+ @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
rm -f $(DESTDIR)$(htmldir)/$$f; \
done
+
+.PHONY: doc doc-clean
Added: hugo/trunk/lemon/Makefile
==============================================================================
--- (empty file)
+++ hugo/trunk/lemon/Makefile Thu Jun 22 20:20:25 2006
@@ -0,0 +1,2 @@
+all:
+ $(MAKE) -C ..
Modified: hugo/trunk/lemon/Makefile.am
==============================================================================
--- hugo/trunk/lemon/Makefile.am (original)
+++ hugo/trunk/lemon/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,117 +1,118 @@
-AM_CPPFLAGS = -I$(top_srcdir)
+pkgconfig_DATA += lemon/lemon.pc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lemon.pc
+lib_LTLIBRARIES += lemon/libemon.la
-lib_LTLIBRARIES = libemon.la
+lemon_libemon_la_SOURCES = \
+ lemon/lp_base.cc \
+ lemon/lp_skeleton.cc \
+ lemon/base.cc \
+ lemon/eps.cc \
+ lemon/bits/mingw32_rand.cc \
+ lemon/bits/mingw32_time.cc
-libemon_la_SOURCES = \
- lp_base.cc \
- lp_skeleton.cc \
- base.cc \
- eps.cc \
- bits/mingw32_rand.cc \
- bits/mingw32_time.cc
-
-libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
-libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
+lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
if HAVE_GLPK
-libemon_la_SOURCES += lp_glpk.cc
+lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
endif
if HAVE_CPLEX
-libemon_la_SOURCES += lp_cplex.cc
+lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
endif
-nobase_pkginclude_HEADERS = \
- bellman_ford.h \
- bezier.h \
- bfs.h \
- bin_heap.h \
- bipartite_matching.h \
- bits/alteration_notifier.h \
- bits/array_map.h \
- bits/base_extender.h \
- bits/default_map.h \
- bits/edge_set_extender.h \
- bits/graph_adaptor_extender.h \
- bits/graph_extender.h \
- bits/invalid.h \
- bits/item_reader.h \
- bits/item_writer.h \
- bits/map_extender.h \
- bits/mingw32_rand.h \
- bits/mingw32_time.h \
- bits/traits.h \
- bits/utility.h \
- bits/vector_map.h \
- bpugraph_adaptor.h \
- bucket_heap.h \
- color.h \
- concept_check.h \
- concept/bpugraph.h \
- concept/graph.h \
- concept/graph_component.h \
- concept/heap.h \
- concept/maps.h \
- concept/matrix_maps.h \
- concept/path.h \
- concept/ugraph.h \
- config.h \
- counter.h \
- dag_shortest_path.h \
- dfs.h \
- dijkstra.h \
- dimacs.h \
- edge_set.h \
- edmonds_karp.h \
- eps.h \
- error.h \
- fib_heap.h \
- floyd_warshall.h \
- fredman_tarjan.h \
- full_graph.h \
- graph_adaptor.h \
- graph_reader.h \
- graph_to_eps.h \
- graph_utils.h \
- graph_writer.h \
- grid_ugraph.h \
- hypercube_graph.h \
- iterable_maps.h \
- johnson.h \
- kruskal.h \
- lemon_reader.h \
- lemon_writer.h \
- list_graph.h \
- lp.h \
- lp_base.h \
- lp_cplex.h \
- lp_glpk.h \
- lp_skeleton.h \
- map_iterator.h \
- maps.h \
- matrix_maps.h \
- max_matching.h \
- min_cost_arborescence.h \
- min_cost_flow.h \
- min_cut.h \
- path.h \
- polynomial.h \
- preflow.h \
- prim.h \
- radix_heap.h \
- radix_sort.h \
- refptr.h \
- simann.h \
- smart_graph.h \
- sub_graph.h \
- suurballe.h \
- tabu_search.h \
- time_measure.h \
- tolerance.h \
- topology.h \
- ugraph_adaptor.h \
- unionfind.h \
- xy.h
+lemon_HEADERS += \
+ lemon/bellman_ford.h \
+ lemon/bezier.h \
+ lemon/bfs.h \
+ lemon/bin_heap.h \
+ lemon/bipartite_matching.h \
+ lemon/bpugraph_adaptor.h \
+ lemon/bucket_heap.h \
+ lemon/color.h \
+ lemon/config.h \
+ lemon/counter.h \
+ lemon/dag_shortest_path.h \
+ lemon/dfs.h \
+ lemon/dijkstra.h \
+ lemon/dimacs.h \
+ lemon/edge_set.h \
+ lemon/edmonds_karp.h \
+ lemon/eps.h \
+ lemon/error.h \
+ lemon/fib_heap.h \
+ lemon/floyd_warshall.h \
+ lemon/fredman_tarjan.h \
+ lemon/full_graph.h \
+ lemon/graph_adaptor.h \
+ lemon/graph_reader.h \
+ lemon/graph_to_eps.h \
+ lemon/graph_utils.h \
+ lemon/graph_writer.h \
+ lemon/grid_ugraph.h \
+ lemon/hypercube_graph.h \
+ lemon/iterable_maps.h \
+ lemon/johnson.h \
+ lemon/kruskal.h \
+ lemon/lemon_reader.h \
+ lemon/lemon_writer.h \
+ lemon/list_graph.h \
+ lemon/lp.h \
+ lemon/lp_base.h \
+ lemon/lp_cplex.h \
+ lemon/lp_glpk.h \
+ lemon/lp_skeleton.h \
+ lemon/map_iterator.h \
+ lemon/maps.h \
+ lemon/matrix_maps.h \
+ lemon/max_matching.h \
+ lemon/min_cost_arborescence.h \
+ lemon/min_cost_flow.h \
+ lemon/min_cut.h \
+ lemon/path.h \
+ lemon/polynomial.h \
+ lemon/preflow.h \
+ lemon/prim.h \
+ lemon/radix_heap.h \
+ lemon/radix_sort.h \
+ lemon/refptr.h \
+ lemon/simann.h \
+ lemon/smart_graph.h \
+ lemon/sub_graph.h \
+ lemon/suurballe.h \
+ lemon/tabu_search.h \
+ lemon/time_measure.h \
+ lemon/tolerance.h \
+ lemon/topology.h \
+ lemon/ugraph_adaptor.h \
+ lemon/unionfind.h \
+ lemon/xy.h
+
+bits_HEADERS += \
+ lemon/bits/alteration_notifier.h \
+ lemon/bits/array_map.h \
+ lemon/bits/base_extender.h \
+ lemon/bits/default_map.h \
+ lemon/bits/edge_set_extender.h \
+ lemon/bits/graph_adaptor_extender.h \
+ lemon/bits/graph_extender.h \
+ lemon/bits/invalid.h \
+ lemon/bits/item_reader.h \
+ lemon/bits/item_writer.h \
+ lemon/bits/map_extender.h \
+ lemon/bits/mingw32_rand.h \
+ lemon/bits/mingw32_time.h \
+ lemon/bits/traits.h \
+ lemon/bits/utility.h \
+ lemon/bits/vector_map.h
+
+concept_HEADERS += \
+ lemon/concept_check.h \
+ lemon/concept/bpugraph.h \
+ lemon/concept/graph.h \
+ lemon/concept/graph_component.h \
+ lemon/concept/heap.h \
+ lemon/concept/maps.h \
+ lemon/concept/matrix_maps.h \
+ lemon/concept/path.h \
+ lemon/concept/ugraph.h
Added: hugo/trunk/test/Makefile
==============================================================================
--- (empty file)
+++ hugo/trunk/test/Makefile Thu Jun 22 20:20:25 2006
@@ -0,0 +1,2 @@
+all:
+ $(MAKE) -C ..
Modified: hugo/trunk/test/Makefile.am
==============================================================================
--- hugo/trunk/test/Makefile.am (original)
+++ hugo/trunk/test/Makefile.am Thu Jun 22 20:20:25 2006
@@ -1,89 +1,87 @@
-AM_CPPFLAGS = -I$(top_srcdir) -fno-inline
-LDADD = $(top_builddir)/lemon/libemon.la
-
-EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
-
-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
+EXTRA_DIST += \
+ test/preflow_graph.dim \
+ test/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
+
+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)
Modified: hugo/trunk/test/heap_test.cc
==============================================================================
--- hugo/trunk/test/heap_test.cc (original)
+++ hugo/trunk/test/heap_test.cc Thu Jun 22 20:20:25 2006
@@ -67,7 +67,7 @@
if( getenv("srcdir") )
f_name = std::string(getenv("srcdir"));
else f_name = ".";
- f_name += "/dijkstra_test.lgf";
+ f_name += "/test/dijkstra_test.lgf";
std::ifstream input(f_name.c_str());
check(input, "Input file '" << f_name << "' not found.");
Modified: hugo/trunk/test/preflow_test.cc
==============================================================================
--- hugo/trunk/test/preflow_test.cc (original)
+++ hugo/trunk/test/preflow_test.cc Thu Jun 22 20:20:25 2006
@@ -91,7 +91,7 @@
if( getenv("srcdir") )
f_name = std::string(getenv("srcdir"));
else f_name = ".";
- f_name += "/preflow_graph.dim";
+ f_name += "/test/preflow_graph.dim";
std::ifstream file(f_name.c_str());
More information about the Lemon-commits
mailing list