1.1 --- a/lemon/Makefile.am	Mon Jan 12 23:11:39 2009 +0100
     1.2 +++ b/lemon/Makefile.am	Thu Nov 05 15:48:01 2009 +0100
     1.3 @@ -1,6 +1,7 @@
     1.4  EXTRA_DIST += \
     1.5  	lemon/lemon.pc.in \
     1.6 -	lemon/CMakeLists.txt
     1.7 +	lemon/CMakeLists.txt \
     1.8 +	lemon/config.h.cmake
     1.9  
    1.10  pkgconfig_DATA += lemon/lemon.pc
    1.11  
    1.12 @@ -12,20 +13,25 @@
    1.13  	lemon/color.cc \
    1.14  	lemon/lp_base.cc \
    1.15  	lemon/lp_skeleton.cc \
    1.16 -	lemon/random.cc
    1.17 +	lemon/random.cc \
    1.18 +	lemon/bits/windows.cc
    1.19  
    1.20 +nodist_lemon_HEADERS = lemon/config.h	
    1.21  
    1.22  lemon_libemon_la_CXXFLAGS = \
    1.23 +	$(AM_CXXFLAGS) \
    1.24  	$(GLPK_CFLAGS) \
    1.25  	$(CPLEX_CFLAGS) \
    1.26  	$(SOPLEX_CXXFLAGS) \
    1.27 -	$(CLP_CXXFLAGS)
    1.28 +	$(CLP_CXXFLAGS) \
    1.29 +	$(CBC_CXXFLAGS)
    1.30  
    1.31  lemon_libemon_la_LDFLAGS = \
    1.32  	$(GLPK_LIBS) \
    1.33  	$(CPLEX_LIBS) \
    1.34  	$(SOPLEX_LIBS) \
    1.35 -	$(CLP_LIBS)
    1.36 +	$(CLP_LIBS) \
    1.37 +	$(CBC_LIBS)
    1.38  
    1.39  if HAVE_GLPK
    1.40  lemon_libemon_la_SOURCES += lemon/glpk.cc
    1.41 @@ -43,16 +49,25 @@
    1.42  lemon_libemon_la_SOURCES += lemon/clp.cc
    1.43  endif
    1.44  
    1.45 +if HAVE_CBC
    1.46 +lemon_libemon_la_SOURCES += lemon/cbc.cc
    1.47 +endif
    1.48 +
    1.49  lemon_HEADERS += \
    1.50  	lemon/adaptors.h \
    1.51  	lemon/arg_parser.h \
    1.52  	lemon/assert.h \
    1.53 +	lemon/bellman_ford.h \
    1.54  	lemon/bfs.h \
    1.55  	lemon/bin_heap.h \
    1.56 +	lemon/binom_heap.h \
    1.57 +	lemon/bucket_heap.h \
    1.58 +	lemon/cbc.h \
    1.59  	lemon/circulation.h \
    1.60  	lemon/clp.h \
    1.61  	lemon/color.h \
    1.62  	lemon/concept_check.h \
    1.63 +	lemon/connectivity.h \
    1.64  	lemon/counter.h \
    1.65  	lemon/core.h \
    1.66  	lemon/cplex.h \
    1.67 @@ -63,11 +78,19 @@
    1.68  	lemon/edge_set.h \
    1.69  	lemon/elevator.h \
    1.70  	lemon/error.h \
    1.71 +	lemon/euler.h \
    1.72 +	lemon/fib_heap.h \
    1.73 +	lemon/fourary_heap.h \
    1.74  	lemon/full_graph.h \
    1.75  	lemon/glpk.h \
    1.76 +	lemon/gomory_hu.h \
    1.77  	lemon/graph_to_eps.h \
    1.78  	lemon/grid_graph.h \
    1.79 +	lemon/hartmann_orlin.h \
    1.80 +	lemon/howard.h \
    1.81  	lemon/hypercube_graph.h \
    1.82 +	lemon/karp.h \
    1.83 +	lemon/kary_heap.h \
    1.84  	lemon/kruskal.h \
    1.85  	lemon/hao_orlin.h \
    1.86  	lemon/lgf_reader.h \
    1.87 @@ -76,26 +99,30 @@
    1.88  	lemon/lp.h \
    1.89  	lemon/lp_base.h \
    1.90  	lemon/lp_skeleton.h \
    1.91 -	lemon/list_graph.h \
    1.92  	lemon/maps.h \
    1.93 +	lemon/matching.h \
    1.94  	lemon/math.h \
    1.95 -	lemon/max_matching.h \
    1.96 +	lemon/min_cost_arborescence.h \
    1.97  	lemon/nauty_reader.h \
    1.98 +	lemon/network_simplex.h \
    1.99 +	lemon/pairing_heap.h \
   1.100  	lemon/path.h \
   1.101  	lemon/preflow.h \
   1.102 +	lemon/radix_heap.h \
   1.103  	lemon/radix_sort.h \
   1.104  	lemon/random.h \
   1.105  	lemon/smart_graph.h \
   1.106  	lemon/soplex.h \
   1.107 +	lemon/static_graph.h \
   1.108  	lemon/suurballe.h \
   1.109  	lemon/time_measure.h \
   1.110  	lemon/tolerance.h \
   1.111 -	lemon/unionfind.h
   1.112 +	lemon/unionfind.h \
   1.113 +	lemon/bits/windows.h
   1.114  
   1.115  bits_HEADERS += \
   1.116  	lemon/bits/alteration_notifier.h \
   1.117  	lemon/bits/array_map.h \
   1.118 -	lemon/bits/base_extender.h \
   1.119  	lemon/bits/bezier.h \
   1.120  	lemon/bits/default_map.h \
   1.121  	lemon/bits/edge_set_extender.h \