COIN-OR::LEMON - Graph Library

Changeset 2108:f2c532541730 in lemon-0.x


Ignore:
Timestamp:
06/22/06 20:20:25 (13 years ago)
Author:
Akos Ladanyi
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2802
Message:

Single makefile.

Files:
5 added
9 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r2103 r2108  
    11ACLOCAL_AMFLAGS = -I m4
     2
     3AM_CPPFLAGS = -I$(top_srcdir)
     4LDADD = $(top_builddir)/lemon/libemon.la
    25
    36EXTRA_DIST = \
     
    811        m4/lx_check_glpk.m4
    912
    10 if WANT_DOC
    11   MAYBE_DOC = doc
    12 endif
    13 if WANT_DEMO
    14   MAYBE_DEMO = demo
    15 endif
    16 if WANT_BENCHMARK
    17   MAYBE_BENCHMARK = benchmark
    18 endif
     13pkgconfigdir = $(libdir)/pkgconfig
     14lemondir = $(pkgincludedir)
     15bitsdir = $(lemondir)/bits
     16conceptdir = $(lemondir)/concept
     17pkgconfig_DATA =
     18lib_LTLIBRARIES =
     19lemon_HEADERS =
     20bits_HEADERS =
     21concept_HEADERS =
     22noinst_HEADERS =
     23noinst_PROGRAMS =
     24check_PROGRAMS =
     25TESTS =
     26XFAIL_TESTS =
    1927
    20 SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
     28include lemon/Makefile.am
     29include test/Makefile.am
     30include doc/Makefile.am
     31include demo/Makefile.am
     32include benchmark/Makefile.am
    2133
    2234MRPROPERFILES = \
     
    4052        demo/Makefile.in
    4153
    42 doc-clean:
    43         $(MAKE) -C doc $(AM_MAKEFLAGS) clean html
    44 
    45 doc:
    46         -rm -f doc/html/index.html
    47         $(MAKE) -C doc $(AM_MAKEFLAGS) html
    48 
    49 benchmark:
    50         $(MAKE) -C benchmark $(AM_MAKEFLAGS)
    51 
    5254mrproper:
    5355        $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
     
    6971        bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
    7072
    71 .PHONY: doc benchmark mrproper deb rpm dist-bz2 distcheck-bz2
     73.PHONY: mrproper deb rpm dist-bz2 distcheck-bz2
  • benchmark/Makefile.am

    r2099 r2108  
    1 AM_CPPFLAGS = -I$(top_srcdir)
     1noinst_HEADERS += benchmark/bench_tools.h
    22
    3 noinst_HEADERS = bench_tools.h
     3if WANT_BENCHMARK
    44
    5 noinst_PROGRAMS = \
    6         graph-bench \
    7         hcube \
    8         swap_bipartite_bench \
    9         bfs-bench \
    10         radix_sort-bench \
    11         swap_bipartite_bench
     5noinst_PROGRAMS += \
     6        benchmark/graph-bench \
     7        benchmark/hcube \
     8        benchmark/swap_bipartite_bench \
     9        benchmark/bfs-bench \
     10        benchmark/radix_sort-bench \
     11        benchmark/swap_bipartite_bench
    1212
    13 graph_bench_SOURCES = graph-bench.cc
     13endif WANT_BENCHMARK
    1414
    15 hcube_SOURCES = hcube.cc
     15benchmark_graph_bench_SOURCES = benchmark/graph-bench.cc
    1616
    17 bfs_bench_SOURCES = bfs-bench.cc
     17benchmark_hcube_SOURCES = benchmark/hcube.cc
    1818
    19 radix_sort_bench_SOURCES = radix_sort-bench.cc
     19benchmark_bfs_bench_SOURCES = benchmark/bfs-bench.cc
    2020
    21 swap_bipartite_bench_SOURCES = swap_bipartite_bench.cc
     21benchmark_radix_sort_bench_SOURCES = benchmark/radix_sort-bench.cc
     22
     23benchmark_swap_bipartite_bench_SOURCES = benchmark/swap_bipartite_bench.cc
  • configure.ac

    r2103 r2108  
    44AC_CONFIG_AUX_DIR([build-aux])
    55AC_CONFIG_MACRO_DIR([m4])
    6 dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign])
    7 AM_INIT_AUTOMAKE([-Wall foreign])
     6AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
    87AC_CONFIG_SRCDIR([lemon/list_graph.h])
    98AC_CONFIG_HEADERS([config.h lemon/config.h])
     
    9998lemon.spec
    10099autopackage/default.apspec
    101 doc/Makefile
    102100doc/Doxyfile
    103 lemon/Makefile
    104101lemon/lemon.pc
    105 benchmark/Makefile
    106 demo/Makefile
    107 test/Makefile
    108102])
    109103
  • demo/Makefile.am

    r2084 r2108  
    1 AM_CPPFLAGS = -I$(top_srcdir)
    2 LDADD = $(top_builddir)/lemon/libemon.la
     1EXTRA_DIST += demo/sub_graph_adaptor_demo.dim
    32
    4 EXTRA_DIST = sub_graph_adaptor_demo.dim
     3if WANT_DEMO
    54
    6 noinst_PROGRAMS = \
    7         dim_to_dot \
    8         dijkstra_demo \
    9         reader_writer_demo \
    10         dim_to_lgf \
    11         eps_demo \
    12         graph_to_eps_demo \
    13         graph_orientation \
    14         min_route \
    15         hello_lemon \
    16         sub_graph_adaptor_demo \
    17         descriptor_map_demo \
    18         coloring \
    19         grid_ugraph_demo \
    20         topology_demo \
    21         simann_maxcut_demo \
    22         disjoint_paths_demo \
    23         strongly_connected_orientation
     5noinst_PROGRAMS += \
     6        demo/dim_to_dot \
     7        demo/dijkstra_demo \
     8        demo/reader_writer_demo \
     9        demo/dim_to_lgf \
     10        demo/eps_demo \
     11        demo/graph_to_eps_demo \
     12        demo/graph_orientation \
     13        demo/min_route \
     14        demo/hello_lemon \
     15        demo/sub_graph_adaptor_demo \
     16        demo/descriptor_map_demo \
     17        demo/coloring \
     18        demo/grid_ugraph_demo \
     19        demo/topology_demo \
     20        demo/simann_maxcut_demo \
     21        demo/disjoint_paths_demo \
     22        demo/strongly_connected_orientation
    2423
    2524if HAVE_GLPK
    26 noinst_PROGRAMS += lp_demo lp_maxflow_demo
     25noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
    2726else !HAVE_GLPK
    2827if HAVE_CPLEX
    29 noinst_PROGRAMS += lp_demo lp_maxflow_demo
     28noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
    3029endif HAVE_CPLEX
    3130endif !HAVE_GLPK
    3231
     32endif WANT_DEMO
    3333
    34 dim_to_dot_SOURCES = dim_to_dot.cc
     34demo_dim_to_dot_SOURCES = demo/dim_to_dot.cc
    3535
    36 dijkstra_demo_SOURCES = dijkstra_demo.cc
     36demo_dijkstra_demo_SOURCES = demo/dijkstra_demo.cc
    3737
    38 eps_demo_SOURCES = eps_demo.cc
     38demo_eps_demo_SOURCES = demo/eps_demo.cc
    3939
    40 reader_writer_demo_SOURCES = reader_writer_demo.cc
     40demo_reader_writer_demo_SOURCES = demo/reader_writer_demo.cc
    4141
    42 dim_to_lgf_SOURCES = dim_to_lgf.cc
     42demo_dim_to_lgf_SOURCES = demo/dim_to_lgf.cc
    4343
    44 coloring_SOURCES = coloring.cc
     44demo_coloring_SOURCES = demo/coloring.cc
    4545
    46 graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
     46demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
    4747
    48 grid_ugraph_demo_SOURCES = grid_ugraph_demo.cc
     48demo_grid_ugraph_demo_SOURCES = demo/grid_ugraph_demo.cc
    4949
    50 graph_orientation_SOURCES = graph_orientation.cc
     50demo_graph_orientation_SOURCES = demo/graph_orientation.cc
    5151
    52 min_route_SOURCES = min_route.cc
     52demo_min_route_SOURCES = demo/min_route.cc
    5353
    54 hello_lemon_SOURCES = hello_lemon.cc
     54demo_hello_lemon_SOURCES = demo/hello_lemon.cc
    5555
    56 sub_graph_adaptor_demo_SOURCES = \
    57         sub_graph_adaptor_demo.cc \
    58         tight_edge_filter_map.h
     56demo_sub_graph_adaptor_demo_SOURCES = \
     57        demo/sub_graph_adaptor_demo.cc \
     58        demo/tight_edge_filter_map.h
    5959
    60 lp_demo_SOURCES = lp_demo.cc
    61 lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
     60demo_lp_demo_SOURCES = demo/lp_demo.cc
     61demo_lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
    6262
    63 lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
    64 lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
     63demo_lp_maxflow_demo_SOURCES = demo/lp_maxflow_demo.cc
     64demo_lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
    6565
    66 descriptor_map_demo_SOURCES = descriptor_map_demo.cc
     66demo_descriptor_map_demo_SOURCES = demo/descriptor_map_demo.cc
    6767
    68 topology_demo_SOURCES = topology_demo.cc
     68demo_topology_demo_SOURCES = demo/topology_demo.cc
    6969
    70 simann_maxcut_demo_SOURCES = simann_maxcut_demo.cc
     70demo_simann_maxcut_demo_SOURCES = demo/simann_maxcut_demo.cc
    7171
    72 disjoint_paths_demo_SOURCES = disjoint_paths_demo.cc
     72demo_disjoint_paths_demo_SOURCES = demo/disjoint_paths_demo.cc
    7373
    74 strongly_connected_orientation_SOURCES = strongly_connected_orientation.cc
     74demo_strongly_connected_orientation_SOURCES = demo/strongly_connected_orientation.cc
  • doc/Makefile.am

    r2071 r2108  
    11htmldir = $(datadir)/doc/$(PACKAGE)/html
    22
    3 EXTRA_DIST = \
    4         html \
    5         icons/geom/ftv2doc.png \
    6         icons/geom/ftv2folderclosed.png \
    7         icons/geom/ftv2folderopen.png \
    8         coding_style.dox \
    9         developers_interface.dox \
    10         dirs.dox \
    11         getstart.dox \
    12         graph-adaptors.dox \
    13         graph_io.dox \
    14         graphs.dox \
    15         groups.dox \
    16         license.dox \
    17         mainpage.dox \
    18         maps.dox \
    19         named-param.dox \
    20         namespaces.dox \
    21         quicktour.dox \
    22         ugraphs.dox
     3EXTRA_DIST += \
     4        doc/html \
     5        doc/icons/geom/ftv2doc.png \
     6        doc/icons/geom/ftv2folderclosed.png \
     7        doc/icons/geom/ftv2folderopen.png \
     8        doc/coding_style.dox \
     9        doc/developers_interface.dox \
     10        doc/dirs.dox \
     11        doc/getstart.dox \
     12        doc/graph-adaptors.dox \
     13        doc/graph_io.dox \
     14        doc/graphs.dox \
     15        doc/groups.dox \
     16        doc/license.dox \
     17        doc/mainpage.dox \
     18        doc/maps.dox \
     19        doc/named-param.dox \
     20        doc/namespaces.dox \
     21        doc/quicktour.dox \
     22        doc/ugraphs.dox
    2323
    24 html/index.html:
     24doc:
    2525        if test ${doxygen_found} = yes; then \
     26          cd doc; \
    2627          doxygen Doxyfile; \
    27           cp $(srcdir)/icons/geom/ftv2* html; \
     28          cd ..; \
     29          cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
    2830        fi
    2931
    30 html: html/index.html
     32doc-clean:
     33        if test ${doxygen_found} = yes; then \
     34          rm -rf doc/html; \
     35          rm -f doc/doxygen.log; \
     36          cd doc; \
     37          doxygen Doxyfile; \
     38          cd ..; \
     39          cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
     40        fi
    3141
    3242clean-local:
    33         -rm -rf html
     43        -rm -rf doc/html
     44        -rm -f doc/doxygen.log
    3445
    35 install-data-local: html/index.html
     46doc/html:
     47        $(MAKE) $(AM_MAKEFLAGS) doc-clean
     48
     49install-data-local: doc/html
    3650        @$(NORMAL_INSTALL)
    3751        $(mkinstalldirs) $(DESTDIR)$(htmldir)
    38         @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 \
     52        @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 \
    3953          f="`echo $$p | sed -e 's|^.*/||'`"; \
    4054          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
     
    4256        done
    4357
    44 uninstall-local: html/index.html
     58uninstall-local: doc/html
    4559        @$(NORMAL_UNINSTALL)
    46         @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 \
     60        @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 \
    4761          f="`echo $$p | sed -e 's|^.*/||'`"; \
    4862          echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
    4963          rm -f $(DESTDIR)$(htmldir)/$$f; \
    5064        done
     65
     66.PHONY: doc doc-clean
  • lemon/Makefile.am

    r2095 r2108  
    1 AM_CPPFLAGS = -I$(top_srcdir)
     1pkgconfig_DATA += lemon/lemon.pc
    22
    3 pkgconfigdir = $(libdir)/pkgconfig
    4 pkgconfig_DATA = lemon.pc
     3lib_LTLIBRARIES += lemon/libemon.la
    54
    6 lib_LTLIBRARIES = libemon.la
     5lemon_libemon_la_SOURCES = \
     6        lemon/lp_base.cc \
     7        lemon/lp_skeleton.cc \
     8        lemon/base.cc \
     9        lemon/eps.cc \
     10        lemon/bits/mingw32_rand.cc \
     11        lemon/bits/mingw32_time.cc
    712
    8 libemon_la_SOURCES = \
    9         lp_base.cc \
    10         lp_skeleton.cc \
    11         base.cc \
    12         eps.cc \
    13         bits/mingw32_rand.cc \
    14         bits/mingw32_time.cc
    15 
    16 libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
    17 libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
     13lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
     14lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
    1815
    1916if HAVE_GLPK
    20 libemon_la_SOURCES += lp_glpk.cc
     17lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
    2118endif
    2219
    2320if HAVE_CPLEX
    24 libemon_la_SOURCES += lp_cplex.cc
     21lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
    2522endif
    2623
    27 nobase_pkginclude_HEADERS = \
    28         bellman_ford.h \
    29         bezier.h \
    30         bfs.h \
    31         bin_heap.h \
    32         bipartite_matching.h \
    33         bits/alteration_notifier.h \
    34         bits/array_map.h \
    35         bits/base_extender.h \
    36         bits/default_map.h \
    37         bits/edge_set_extender.h \
    38         bits/graph_adaptor_extender.h \
    39         bits/graph_extender.h \
    40         bits/invalid.h \
    41         bits/item_reader.h \
    42         bits/item_writer.h \
    43         bits/map_extender.h \
    44         bits/mingw32_rand.h \
    45         bits/mingw32_time.h \
    46         bits/traits.h \
    47         bits/utility.h \
    48         bits/vector_map.h \
    49         bpugraph_adaptor.h \
    50         bucket_heap.h \
    51         color.h \
    52         concept_check.h \
    53         concept/bpugraph.h \
    54         concept/graph.h \
    55         concept/graph_component.h \
    56         concept/heap.h \
    57         concept/maps.h \
    58         concept/matrix_maps.h \
    59         concept/path.h \
    60         concept/ugraph.h \
    61         config.h \
    62         counter.h \
    63         dag_shortest_path.h \
    64         dfs.h \
    65         dijkstra.h \
    66         dimacs.h \
    67         edge_set.h \
    68         edmonds_karp.h \
    69         eps.h \
    70         error.h \
    71         fib_heap.h \
    72         floyd_warshall.h \
    73         fredman_tarjan.h \
    74         full_graph.h \
    75         graph_adaptor.h \
    76         graph_reader.h \
    77         graph_to_eps.h \
    78         graph_utils.h \
    79         graph_writer.h \
    80         grid_ugraph.h \
    81         hypercube_graph.h \
    82         iterable_maps.h \
    83         johnson.h \
    84         kruskal.h \
    85         lemon_reader.h \
    86         lemon_writer.h \
    87         list_graph.h \
    88         lp.h \
    89         lp_base.h \
    90         lp_cplex.h \
    91         lp_glpk.h \
    92         lp_skeleton.h \
    93         map_iterator.h \
    94         maps.h \
    95         matrix_maps.h \
    96         max_matching.h \
    97         min_cost_arborescence.h \
    98         min_cost_flow.h \
    99         min_cut.h \
    100         path.h \
    101         polynomial.h \
    102         preflow.h \
    103         prim.h \
    104         radix_heap.h \
    105         radix_sort.h \
    106         refptr.h \
    107         simann.h \
    108         smart_graph.h \
    109         sub_graph.h \
    110         suurballe.h \
    111         tabu_search.h \
    112         time_measure.h \
    113         tolerance.h \
    114         topology.h \
    115         ugraph_adaptor.h \
    116         unionfind.h \
    117         xy.h
     24lemon_HEADERS += \
     25        lemon/bellman_ford.h \
     26        lemon/bezier.h \
     27        lemon/bfs.h \
     28        lemon/bin_heap.h \
     29        lemon/bipartite_matching.h \
     30        lemon/bpugraph_adaptor.h \
     31        lemon/bucket_heap.h \
     32        lemon/color.h \
     33        lemon/config.h \
     34        lemon/counter.h \
     35        lemon/dag_shortest_path.h \
     36        lemon/dfs.h \
     37        lemon/dijkstra.h \
     38        lemon/dimacs.h \
     39        lemon/edge_set.h \
     40        lemon/edmonds_karp.h \
     41        lemon/eps.h \
     42        lemon/error.h \
     43        lemon/fib_heap.h \
     44        lemon/floyd_warshall.h \
     45        lemon/fredman_tarjan.h \
     46        lemon/full_graph.h \
     47        lemon/graph_adaptor.h \
     48        lemon/graph_reader.h \
     49        lemon/graph_to_eps.h \
     50        lemon/graph_utils.h \
     51        lemon/graph_writer.h \
     52        lemon/grid_ugraph.h \
     53        lemon/hypercube_graph.h \
     54        lemon/iterable_maps.h \
     55        lemon/johnson.h \
     56        lemon/kruskal.h \
     57        lemon/lemon_reader.h \
     58        lemon/lemon_writer.h \
     59        lemon/list_graph.h \
     60        lemon/lp.h \
     61        lemon/lp_base.h \
     62        lemon/lp_cplex.h \
     63        lemon/lp_glpk.h \
     64        lemon/lp_skeleton.h \
     65        lemon/map_iterator.h \
     66        lemon/maps.h \
     67        lemon/matrix_maps.h \
     68        lemon/max_matching.h \
     69        lemon/min_cost_arborescence.h \
     70        lemon/min_cost_flow.h \
     71        lemon/min_cut.h \
     72        lemon/path.h \
     73        lemon/polynomial.h \
     74        lemon/preflow.h \
     75        lemon/prim.h \
     76        lemon/radix_heap.h \
     77        lemon/radix_sort.h \
     78        lemon/refptr.h \
     79        lemon/simann.h \
     80        lemon/smart_graph.h \
     81        lemon/sub_graph.h \
     82        lemon/suurballe.h \
     83        lemon/tabu_search.h \
     84        lemon/time_measure.h \
     85        lemon/tolerance.h \
     86        lemon/topology.h \
     87        lemon/ugraph_adaptor.h \
     88        lemon/unionfind.h \
     89        lemon/xy.h
     90
     91bits_HEADERS += \
     92        lemon/bits/alteration_notifier.h \
     93        lemon/bits/array_map.h \
     94        lemon/bits/base_extender.h \
     95        lemon/bits/default_map.h \
     96        lemon/bits/edge_set_extender.h \
     97        lemon/bits/graph_adaptor_extender.h \
     98        lemon/bits/graph_extender.h \
     99        lemon/bits/invalid.h \
     100        lemon/bits/item_reader.h \
     101        lemon/bits/item_writer.h \
     102        lemon/bits/map_extender.h \
     103        lemon/bits/mingw32_rand.h \
     104        lemon/bits/mingw32_time.h \
     105        lemon/bits/traits.h \
     106        lemon/bits/utility.h \
     107        lemon/bits/vector_map.h
     108
     109concept_HEADERS += \
     110        lemon/concept_check.h \
     111        lemon/concept/bpugraph.h \
     112        lemon/concept/graph.h \
     113        lemon/concept/graph_component.h \
     114        lemon/concept/heap.h \
     115        lemon/concept/maps.h \
     116        lemon/concept/matrix_maps.h \
     117        lemon/concept/path.h \
     118        lemon/concept/ugraph.h
  • test/Makefile.am

    r2086 r2108  
    1 AM_CPPFLAGS = -I$(top_srcdir) -fno-inline
    2 LDADD = $(top_builddir)/lemon/libemon.la
     1EXTRA_DIST += \
     2        test/preflow_graph.dim \
     3        test/dijkstra_test.lgf
    34
    4 EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
     5noinst_HEADERS += \
     6        test/test_tools.h \
     7        test/graph_test.h \
     8        test/map_test.h \
     9        test/graph_utils_test.h \
     10        test/heap_test.h
    511
    6 noinst_HEADERS = \
    7         test_tools.h \
    8         graph_test.h \
    9         map_test.h \
    10         graph_utils_test.h \
    11         heap_test.h
    12 
    13 
    14 check_PROGRAMS = \
    15         all_pairs_shortest_path_test \
    16         arborescence_test \
    17         bfs_test \
    18         bipartite_matching_test \
    19         counter_test \
    20         dfs_test \
    21         dijkstra_test \
    22         edge_set_test \
    23         graph_adaptor_test \
    24         graph_test \
    25         graph_utils_test \
    26         heap_test \
    27         kruskal_test \
    28         maps_test \
    29         matrix_maps_test \
    30         max_matching_test \
    31         min_cost_flow_test \
    32         path_test \
    33         polynomial_test \
    34         preflow_test \
    35         radix_sort_test \
    36         refptr_test \
    37         simann_test \
    38         suurballe_test \
    39         test_tools_fail \
    40         test_tools_pass \
    41         time_measure_test \
    42         ugraph_test \
    43         unionfind_test \
    44         xy_test
     12check_PROGRAMS += \
     13        test/all_pairs_shortest_path_test \
     14        test/arborescence_test \
     15        test/bfs_test \
     16        test/bipartite_matching_test \
     17        test/counter_test \
     18        test/dfs_test \
     19        test/dijkstra_test \
     20        test/edge_set_test \
     21        test/graph_adaptor_test \
     22        test/graph_test \
     23        test/graph_utils_test \
     24        test/heap_test \
     25        test/kruskal_test \
     26        test/maps_test \
     27        test/matrix_maps_test \
     28        test/max_matching_test \
     29        test/min_cost_flow_test \
     30        test/path_test \
     31        test/polynomial_test \
     32        test/preflow_test \
     33        test/radix_sort_test \
     34        test/refptr_test \
     35        test/simann_test \
     36        test/suurballe_test \
     37        test/test_tools_fail \
     38        test/test_tools_pass \
     39        test/time_measure_test \
     40        test/ugraph_test \
     41        test/unionfind_test \
     42        test/xy_test
    4543
    4644if HAVE_GLPK
    47 check_PROGRAMS += lp_test
     45check_PROGRAMS += test/lp_test
    4846else !HAVE_GLPK
    4947if HAVE_CPLEX
    50 check_PROGRAMS += lp_test
     48check_PROGRAMS += test/lp_test
    5149endif HAVE_CPLEX
    5250endif !HAVE_GLPK
    5351
    54 TESTS = $(check_PROGRAMS)
    55 XFAIL_TESTS = test_tools_fail$(EXEEXT)
     52TESTS += $(check_PROGRAMS)
     53XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    5654
    57 all_pairs_shortest_path_test_SOURCES = all_pairs_shortest_path_test.cc
    58 arborescence_test_SOURCES = arborescence_test.cc
    59 bfs_test_SOURCES = bfs_test.cc
    60 bipartite_matching_test_SOURCES = bipartite_matching_test.cc
    61 counter_test_SOURCES = counter_test.cc
    62 dfs_test_SOURCES = dfs_test.cc
    63 dijkstra_test_SOURCES = dijkstra_test.cc
    64 edge_set_test_SOURCES = edge_set_test.cc
    65 graph_adaptor_test_SOURCES = graph_adaptor_test.cc
    66 graph_test_SOURCES = graph_test.cc
    67 graph_utils_test_SOURCES = graph_utils_test.cc
    68 heap_test_SOURCES = heap_test.cc
    69 kruskal_test_SOURCES = kruskal_test.cc
    70 maps_test_SOURCES = maps_test.cc
    71 matrix_maps_test_SOURCES = matrix_maps_test.cc
    72 max_matching_test_SOURCES = max_matching_test.cc
    73 min_cost_flow_test_SOURCES = min_cost_flow_test.cc
    74 path_test_SOURCES = path_test.cc
    75 polynomial_test_SOURCES = polynomial_test.cc
    76 preflow_test_SOURCES = preflow_test.cc
    77 radix_sort_test_SOURCES = radix_sort_test.cc
    78 refptr_test_SOURCES = refptr_test.cc
    79 simann_test_SOURCES = simann_test.cc
    80 suurballe_test_SOURCES = suurballe_test.cc
    81 test_tools_fail_SOURCES = test_tools_fail.cc
    82 test_tools_pass_SOURCES = test_tools_pass.cc
    83 time_measure_test_SOURCES = time_measure_test.cc
    84 ugraph_test_SOURCES = ugraph_test.cc
    85 unionfind_test_SOURCES = unionfind_test.cc
    86 xy_test_SOURCES = xy_test.cc
     55test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc
     56test_arborescence_test_SOURCES = test/arborescence_test.cc
     57test_bfs_test_SOURCES = test/bfs_test.cc
     58test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc
     59test_counter_test_SOURCES = test/counter_test.cc
     60test_dfs_test_SOURCES = test/dfs_test.cc
     61test_dijkstra_test_SOURCES = test/dijkstra_test.cc
     62test_edge_set_test_SOURCES = test/edge_set_test.cc
     63test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
     64test_graph_test_SOURCES = test/graph_test.cc
     65test_graph_utils_test_SOURCES = test/graph_utils_test.cc
     66test_heap_test_SOURCES = test/heap_test.cc
     67test_kruskal_test_SOURCES = test/kruskal_test.cc
     68test_maps_test_SOURCES = test/maps_test.cc
     69test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
     70test_max_matching_test_SOURCES = test/max_matching_test.cc
     71test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
     72test_path_test_SOURCES = test/path_test.cc
     73test_polynomial_test_SOURCES = test/polynomial_test.cc
     74test_preflow_test_SOURCES = test/preflow_test.cc
     75test_radix_sort_test_SOURCES = test/radix_sort_test.cc
     76test_refptr_test_SOURCES = test/refptr_test.cc
     77test_simann_test_SOURCES = test/simann_test.cc
     78test_suurballe_test_SOURCES = test/suurballe_test.cc
     79test_test_tools_fail_SOURCES = test/test_tools_fail.cc
     80test_test_tools_pass_SOURCES = test/test_tools_pass.cc
     81test_time_measure_test_SOURCES = test/time_measure_test.cc
     82test_ugraph_test_SOURCES = test/ugraph_test.cc
     83test_unionfind_test_SOURCES = test/unionfind_test.cc
     84test_xy_test_SOURCES = test/xy_test.cc
    8785
    88 lp_test_SOURCES = lp_test.cc
    89 lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
     86test_lp_test_SOURCES = test/lp_test.cc
     87test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
  • test/heap_test.cc

    r2038 r2108  
    6868    f_name = std::string(getenv("srcdir"));
    6969  else f_name = ".";
    70   f_name += "/dijkstra_test.lgf";
     70  f_name += "/test/dijkstra_test.lgf";
    7171 
    7272  std::ifstream input(f_name.c_str());
  • test/preflow_test.cc

    r1956 r2108  
    9292    f_name = std::string(getenv("srcdir"));
    9393  else f_name = ".";
    94   f_name += "/preflow_graph.dim";
     94  f_name += "/test/preflow_graph.dim";
    9595 
    9696  std::ifstream file(f_name.c_str());
Note: See TracChangeset for help on using the changeset viewer.