1.1 --- a/lemon/Makefile.am Fri Oct 16 10:21:37 2009 +0200
1.2 +++ b/lemon/Makefile.am Thu Nov 05 15:50:01 2009 +0100
1.3 @@ -1,62 +1,139 @@
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 lib_LTLIBRARIES += lemon/libemon.la
1.13
1.14 lemon_libemon_la_SOURCES = \
1.15 - lemon/arg_parser.cc \
1.16 - lemon/base.cc \
1.17 - lemon/color.cc \
1.18 - lemon/random.cc \
1.19 + lemon/arg_parser.cc \
1.20 + lemon/base.cc \
1.21 + lemon/color.cc \
1.22 + lemon/lp_base.cc \
1.23 + lemon/lp_skeleton.cc \
1.24 + lemon/random.cc \
1.25 lemon/bits/windows.cc
1.26
1.27 -#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
1.28 -#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
1.29 +nodist_lemon_HEADERS = lemon/config.h
1.30
1.31 -nodist_lemon_HEADERS = lemon/config.h
1.32 +lemon_libemon_la_CXXFLAGS = \
1.33 + $(AM_CXXFLAGS) \
1.34 + $(GLPK_CFLAGS) \
1.35 + $(CPLEX_CFLAGS) \
1.36 + $(SOPLEX_CXXFLAGS) \
1.37 + $(CLP_CXXFLAGS) \
1.38 + $(CBC_CXXFLAGS)
1.39 +
1.40 +lemon_libemon_la_LDFLAGS = \
1.41 + $(GLPK_LIBS) \
1.42 + $(CPLEX_LIBS) \
1.43 + $(SOPLEX_LIBS) \
1.44 + $(CLP_LIBS) \
1.45 + $(CBC_LIBS)
1.46 +
1.47 +if HAVE_GLPK
1.48 +lemon_libemon_la_SOURCES += lemon/glpk.cc
1.49 +endif
1.50 +
1.51 +if HAVE_CPLEX
1.52 +lemon_libemon_la_SOURCES += lemon/cplex.cc
1.53 +endif
1.54 +
1.55 +if HAVE_SOPLEX
1.56 +lemon_libemon_la_SOURCES += lemon/soplex.cc
1.57 +endif
1.58 +
1.59 +if HAVE_CLP
1.60 +lemon_libemon_la_SOURCES += lemon/clp.cc
1.61 +endif
1.62 +
1.63 +if HAVE_CBC
1.64 +lemon_libemon_la_SOURCES += lemon/cbc.cc
1.65 +endif
1.66
1.67 lemon_HEADERS += \
1.68 - lemon/arg_parser.h \
1.69 + lemon/adaptors.h \
1.70 + lemon/arg_parser.h \
1.71 lemon/assert.h \
1.72 - lemon/bfs.h \
1.73 - lemon/bin_heap.h \
1.74 - lemon/color.h \
1.75 + lemon/bellman_ford.h \
1.76 + lemon/bfs.h \
1.77 + lemon/bin_heap.h \
1.78 + lemon/binom_heap.h \
1.79 + lemon/bucket_heap.h \
1.80 + lemon/cbc.h \
1.81 + lemon/circulation.h \
1.82 + lemon/clp.h \
1.83 + lemon/color.h \
1.84 lemon/concept_check.h \
1.85 - lemon/counter.h \
1.86 + lemon/connectivity.h \
1.87 + lemon/counter.h \
1.88 lemon/core.h \
1.89 - lemon/dfs.h \
1.90 - lemon/dijkstra.h \
1.91 - lemon/dim2.h \
1.92 + lemon/cplex.h \
1.93 + lemon/dfs.h \
1.94 + lemon/dijkstra.h \
1.95 + lemon/dim2.h \
1.96 + lemon/dimacs.h \
1.97 + lemon/edge_set.h \
1.98 + lemon/elevator.h \
1.99 lemon/error.h \
1.100 - lemon/graph_to_eps.h \
1.101 + lemon/euler.h \
1.102 + lemon/fib_heap.h \
1.103 + lemon/fourary_heap.h \
1.104 + lemon/full_graph.h \
1.105 + lemon/glpk.h \
1.106 + lemon/gomory_hu.h \
1.107 + lemon/graph_to_eps.h \
1.108 + lemon/grid_graph.h \
1.109 + lemon/hartmann_orlin.h \
1.110 + lemon/howard.h \
1.111 + lemon/hypercube_graph.h \
1.112 + lemon/karp.h \
1.113 + lemon/kary_heap.h \
1.114 lemon/kruskal.h \
1.115 + lemon/hao_orlin.h \
1.116 lemon/lgf_reader.h \
1.117 lemon/lgf_writer.h \
1.118 lemon/list_graph.h \
1.119 + lemon/lp.h \
1.120 + lemon/lp_base.h \
1.121 + lemon/lp_skeleton.h \
1.122 lemon/maps.h \
1.123 + lemon/matching.h \
1.124 lemon/math.h \
1.125 + lemon/min_cost_arborescence.h \
1.126 + lemon/nauty_reader.h \
1.127 + lemon/network_simplex.h \
1.128 + lemon/pairing_heap.h \
1.129 lemon/path.h \
1.130 - lemon/random.h \
1.131 + lemon/preflow.h \
1.132 + lemon/radix_heap.h \
1.133 + lemon/radix_sort.h \
1.134 + lemon/random.h \
1.135 lemon/smart_graph.h \
1.136 - lemon/time_measure.h \
1.137 - lemon/tolerance.h \
1.138 + lemon/soplex.h \
1.139 + lemon/static_graph.h \
1.140 + lemon/suurballe.h \
1.141 + lemon/time_measure.h \
1.142 + lemon/tolerance.h \
1.143 lemon/unionfind.h \
1.144 lemon/bits/windows.h
1.145
1.146 bits_HEADERS += \
1.147 lemon/bits/alteration_notifier.h \
1.148 lemon/bits/array_map.h \
1.149 - lemon/bits/base_extender.h \
1.150 - lemon/bits/bezier.h \
1.151 + lemon/bits/bezier.h \
1.152 lemon/bits/default_map.h \
1.153 - lemon/bits/enable_if.h \
1.154 + lemon/bits/edge_set_extender.h \
1.155 + lemon/bits/enable_if.h \
1.156 + lemon/bits/graph_adaptor_extender.h \
1.157 lemon/bits/graph_extender.h \
1.158 lemon/bits/map_extender.h \
1.159 lemon/bits/path_dump.h \
1.160 + lemon/bits/solver_bits.h \
1.161 lemon/bits/traits.h \
1.162 + lemon/bits/variant.h \
1.163 lemon/bits/vector_map.h
1.164
1.165 concept_HEADERS += \