COIN-OR::LEMON - Graph Library

Changeset 65:bfbc57a51fbb in lemon-1.0


Ignore:
Timestamp:
02/06/08 11:52:58 (12 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
24:1f781d1f9b79 (diff), 31:742abd64255e (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 (redo buggy merge ad7f593399b0)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r10 r65  
    1616
    1717lemon_HEADERS += \
     18        lemon/concept_check.h \
    1819        lemon/dim2.h \
    1920        lemon/random.h \
    2021        lemon/list_graph.h \
     22        lemon/maps.h \
    2123        lemon/tolerance.h
    2224
     
    2527        lemon/bits/utility.h
    2628
    27 concept_HEADERS +=
     29concept_HEADERS += \
     30        lemon/concepts/maps.h
  • lemon/Makefile.am

    r25 r65  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/base.cc
     10        lemon/base.cc \
     11        lemon/random.cc
     12
    1113
    1214lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     
    1517lemon_HEADERS += \
    1618        lemon/concept_check.h \
     19        lemon/dim2.h \
     20        lemon/random.h \
    1721        lemon/list_graph.h \
    1822        lemon/maps.h \
  • test/Makefile.am

    r10 r65  
    77check_PROGRAMS += \
    88        test/dim_test \
     9        test/maps_test \
    910        test/random_test \
    1011        test/test_tools_fail \
     
    1516
    1617test_dim_test_SOURCES = test/dim_test.cc
     18test_maps_test_SOURCES = test/maps_test.cc
    1719test_random_test_SOURCES = test/random_test.cc
    1820test_test_tools_fail_SOURCES = test/test_tools_fail.cc
  • test/Makefile.am

    r25 r65  
    44noinst_HEADERS += \
    55        test/test_tools.h
    6  
     6
    77check_PROGRAMS += \
     8        test/dim_test \
    89        test/maps_test \
     10        test/random_test \
    911        test/test_tools_fail \
    1012        test/test_tools_pass
    11  
     13
    1214TESTS += $(check_PROGRAMS)
    1315XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    1416
     17test_dim_test_SOURCES = test/dim_test.cc
    1518test_maps_test_SOURCES = test/maps_test.cc
     19test_random_test_SOURCES = test/random_test.cc
    1620test_test_tools_fail_SOURCES = test/test_tools_fail.cc
    1721test_test_tools_pass_SOURCES = test/test_tools_pass.cc
Note: See TracChangeset for help on using the changeset viewer.