COIN-OR::LEMON - Graph Library

Changeset 67:9de02aa380de in lemon-1.2


Ignore:
Timestamp:
02/07/08 22:23:23 (12 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
69:914ffb9b3798, 99:dbaa96cc1013
Parents:
66:5f7a8570687d (diff), 65:bfbc57a51fbb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r65 r67  
    1818        lemon/concept_check.h \
    1919        lemon/dim2.h \
     20        lemon/error.h \
     21        lemon/list_graph.h \
     22        lemon/maps.h \
    2023        lemon/random.h \
    21         lemon/list_graph.h \
    22         lemon/maps.h \
    2324        lemon/tolerance.h
    2425
    2526bits_HEADERS += \
     27        lemon/bits/alteration_notifier.h \
     28        lemon/bits/array_map.h \
     29        lemon/bits/base_extender.h \
     30        lemon/bits/default_map.h \
     31        lemon/bits/graph_extender.h \
    2632        lemon/bits/invalid.h \
    27         lemon/bits/utility.h
     33        lemon/bits/map_extender.h \
     34        lemon/bits/traits.h \
     35        lemon/bits/utility.h \
     36        lemon/bits/vector_map.h
    2837
    2938concept_HEADERS += \
    30         lemon/concepts/maps.h
     39        lemon/concept_check.h \
     40        lemon/concepts/digraph.h \
     41        lemon/concepts/graph.h \
     42        lemon/concepts/maps.h \
     43        lemon/concepts/graph_components.h
  • lemon/Makefile.am

    r66 r67  
    1616
    1717lemon_HEADERS += \
     18        lemon/concept_check.h \
    1819        lemon/dim2.h \
    1920        lemon/error.h \
  • test/Makefile.am

    r65 r67  
    33
    44noinst_HEADERS += \
     5        test/digraph_test.h \
     6        test/map_test.h \
    57        test/test_tools.h
    68
    79check_PROGRAMS += \
     10        test/digraph_test \
    811        test/dim_test \
     12        test/graph_test \
    913        test/maps_test \
    1014        test/random_test \
     
    1519XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    1620
     21test_digraph_test_SOURCES = test/digraph_test.cc
    1722test_dim_test_SOURCES = test/dim_test.cc
     23#test_error_test_SOURCES = test/error_test.cc
     24test_graph_test_SOURCES = test/graph_test.cc
    1825test_maps_test_SOURCES = test/maps_test.cc
    1926test_random_test_SOURCES = test/random_test.cc
  • test/Makefile.am

    r66 r67  
    1111        test/dim_test \
    1212        test/graph_test \
     13        test/maps_test \
    1314        test/random_test \
    1415        test/test_tools_fail \
     
    2223#test_error_test_SOURCES = test/error_test.cc
    2324test_graph_test_SOURCES = test/graph_test.cc
     25test_maps_test_SOURCES = test/maps_test.cc
    2426test_random_test_SOURCES = test/random_test.cc
    2527test_test_tools_fail_SOURCES = test/test_tools_fail.cc
Note: See TracChangeset for help on using the changeset viewer.