1.1 --- a/lemon/Makefile.am Tue Jul 04 10:21:38 2006 +0000
1.2 +++ b/lemon/Makefile.am Tue Jul 04 11:58:39 2006 +0000
1.3 @@ -1,118 +1,118 @@
1.4 pkgconfig_DATA += lemon/lemon.pc
1.5
1.6 -#lib_LTLIBRARIES += lemon/libemon.la
1.7 +lib_LTLIBRARIES += lemon/libemon.la
1.8
1.9 -#lemon_libemon_la_SOURCES = \
1.10 -# lemon/lp_base.cc \
1.11 -# lemon/lp_skeleton.cc \
1.12 -# lemon/base.cc \
1.13 -# lemon/eps.cc \
1.14 -# lemon/bits/mingw32_rand.cc \
1.15 -# lemon/bits/mingw32_time.cc
1.16 +lemon_libemon_la_SOURCES =
1.17 +## lemon/lp_base.cc \
1.18 +## lemon/lp_skeleton.cc \
1.19 +## lemon/base.cc \
1.20 +## lemon/eps.cc \
1.21 +## lemon/bits/mingw32_rand.cc \
1.22 +## lemon/bits/mingw32_time.cc
1.23
1.24 -#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
1.25 -#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
1.26 +lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
1.27 +lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
1.28
1.29 if HAVE_GLPK
1.30 -#lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
1.31 +##lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
1.32 endif
1.33
1.34 if HAVE_CPLEX
1.35 -#lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
1.36 +##lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
1.37 endif
1.38
1.39 -#lemon_HEADERS += \
1.40 -# lemon/bellman_ford.h \
1.41 -# lemon/bezier.h \
1.42 -# lemon/bfs.h \
1.43 -# lemon/bin_heap.h \
1.44 -# lemon/bipartite_matching.h \
1.45 -# lemon/bpugraph_adaptor.h \
1.46 -# lemon/bucket_heap.h \
1.47 -# lemon/color.h \
1.48 -# lemon/config.h \
1.49 -# lemon/counter.h \
1.50 -# lemon/dag_shortest_path.h \
1.51 -# lemon/dfs.h \
1.52 -# lemon/dijkstra.h \
1.53 -# lemon/dimacs.h \
1.54 -# lemon/edge_set.h \
1.55 -# lemon/edmonds_karp.h \
1.56 -# lemon/eps.h \
1.57 -# lemon/error.h \
1.58 -# lemon/fib_heap.h \
1.59 -# lemon/floyd_warshall.h \
1.60 -# lemon/fredman_tarjan.h \
1.61 -# lemon/full_graph.h \
1.62 -# lemon/graph_adaptor.h \
1.63 -# lemon/graph_reader.h \
1.64 -# lemon/graph_to_eps.h \
1.65 -# lemon/graph_utils.h \
1.66 -# lemon/graph_writer.h \
1.67 -# lemon/grid_ugraph.h \
1.68 -# lemon/hypercube_graph.h \
1.69 -# lemon/iterable_maps.h \
1.70 -# lemon/johnson.h \
1.71 -# lemon/kruskal.h \
1.72 -# lemon/lemon_reader.h \
1.73 -# lemon/lemon_writer.h \
1.74 -# lemon/list_graph.h \
1.75 -# lemon/lp.h \
1.76 -# lemon/lp_base.h \
1.77 -# lemon/lp_cplex.h \
1.78 -# lemon/lp_glpk.h \
1.79 -# lemon/lp_skeleton.h \
1.80 -# lemon/map_iterator.h \
1.81 -# lemon/maps.h \
1.82 -# lemon/matrix_maps.h \
1.83 -# lemon/max_matching.h \
1.84 -# lemon/min_cost_arborescence.h \
1.85 -# lemon/min_cost_flow.h \
1.86 -# lemon/min_cut.h \
1.87 -# lemon/path.h \
1.88 -# lemon/polynomial.h \
1.89 -# lemon/preflow.h \
1.90 -# lemon/prim.h \
1.91 -# lemon/radix_heap.h \
1.92 -# lemon/radix_sort.h \
1.93 -# lemon/refptr.h \
1.94 -# lemon/simann.h \
1.95 -# lemon/smart_graph.h \
1.96 -# lemon/sub_graph.h \
1.97 -# lemon/suurballe.h \
1.98 -# lemon/tabu_search.h \
1.99 -# lemon/time_measure.h \
1.100 -# lemon/tolerance.h \
1.101 -# lemon/topology.h \
1.102 -# lemon/ugraph_adaptor.h \
1.103 -# lemon/unionfind.h \
1.104 -# lemon/xy.h
1.105 +lemon_HEADERS +=
1.106 +## lemon/bellman_ford.h \
1.107 +## lemon/bezier.h \
1.108 +## lemon/bfs.h \
1.109 +## lemon/bin_heap.h \
1.110 +## lemon/bipartite_matching.h \
1.111 +## lemon/bpugraph_adaptor.h \
1.112 +## lemon/bucket_heap.h \
1.113 +## lemon/color.h \
1.114 +## lemon/config.h \
1.115 +## lemon/counter.h \
1.116 +## lemon/dag_shortest_path.h \
1.117 +## lemon/dfs.h \
1.118 +## lemon/dijkstra.h \
1.119 +## lemon/dimacs.h \
1.120 +## lemon/edge_set.h \
1.121 +## lemon/edmonds_karp.h \
1.122 +## lemon/eps.h \
1.123 +## lemon/error.h \
1.124 +## lemon/fib_heap.h \
1.125 +## lemon/floyd_warshall.h \
1.126 +## lemon/fredman_tarjan.h \
1.127 +## lemon/full_graph.h \
1.128 +## lemon/graph_adaptor.h \
1.129 +## lemon/graph_reader.h \
1.130 +## lemon/graph_to_eps.h \
1.131 +## lemon/graph_utils.h \
1.132 +## lemon/graph_writer.h \
1.133 +## lemon/grid_ugraph.h \
1.134 +## lemon/hypercube_graph.h \
1.135 +## lemon/iterable_maps.h \
1.136 +## lemon/johnson.h \
1.137 +## lemon/kruskal.h \
1.138 +## lemon/lemon_reader.h \
1.139 +## lemon/lemon_writer.h \
1.140 +## lemon/list_graph.h \
1.141 +## lemon/lp.h \
1.142 +## lemon/lp_base.h \
1.143 +## lemon/lp_cplex.h \
1.144 +## lemon/lp_glpk.h \
1.145 +## lemon/lp_skeleton.h \
1.146 +## lemon/map_iterator.h \
1.147 +## lemon/maps.h \
1.148 +## lemon/matrix_maps.h \
1.149 +## lemon/max_matching.h \
1.150 +## lemon/min_cost_arborescence.h \
1.151 +## lemon/min_cost_flow.h \
1.152 +## lemon/min_cut.h \
1.153 +## lemon/path.h \
1.154 +## lemon/polynomial.h \
1.155 +## lemon/preflow.h \
1.156 +## lemon/prim.h \
1.157 +## lemon/radix_heap.h \
1.158 +## lemon/radix_sort.h \
1.159 +## lemon/refptr.h \
1.160 +## lemon/simann.h \
1.161 +## lemon/smart_graph.h \
1.162 +## lemon/sub_graph.h \
1.163 +## lemon/suurballe.h \
1.164 +## lemon/tabu_search.h \
1.165 +## lemon/time_measure.h \
1.166 +## lemon/tolerance.h \
1.167 +## lemon/topology.h \
1.168 +## lemon/ugraph_adaptor.h \
1.169 +## lemon/unionfind.h \
1.170 +## lemon/xy.h
1.171
1.172 -#bits_HEADERS += \
1.173 -# lemon/bits/alteration_notifier.h \
1.174 -# lemon/bits/array_map.h \
1.175 -# lemon/bits/base_extender.h \
1.176 -# lemon/bits/default_map.h \
1.177 -# lemon/bits/edge_set_extender.h \
1.178 -# lemon/bits/graph_adaptor_extender.h \
1.179 -# lemon/bits/graph_extender.h \
1.180 -# lemon/bits/invalid.h \
1.181 -# lemon/bits/item_reader.h \
1.182 -# lemon/bits/item_writer.h \
1.183 -# lemon/bits/map_extender.h \
1.184 -# lemon/bits/mingw32_rand.h \
1.185 -# lemon/bits/mingw32_time.h \
1.186 -# lemon/bits/traits.h \
1.187 -# lemon/bits/utility.h \
1.188 -# lemon/bits/vector_map.h
1.189 +bits_HEADERS +=
1.190 +## lemon/bits/alteration_notifier.h \
1.191 +## lemon/bits/array_map.h \
1.192 +## lemon/bits/base_extender.h \
1.193 +## lemon/bits/default_map.h \
1.194 +## lemon/bits/edge_set_extender.h \
1.195 +## lemon/bits/graph_adaptor_extender.h \
1.196 +## lemon/bits/graph_extender.h \
1.197 +## lemon/bits/invalid.h \
1.198 +## lemon/bits/item_reader.h \
1.199 +## lemon/bits/item_writer.h \
1.200 +## lemon/bits/map_extender.h \
1.201 +## lemon/bits/mingw32_rand.h \
1.202 +## lemon/bits/mingw32_time.h \
1.203 +## lemon/bits/traits.h \
1.204 +## lemon/bits/utility.h \
1.205 +## lemon/bits/vector_map.h
1.206
1.207 -#concept_HEADERS += \
1.208 -# lemon/concept_check.h \
1.209 -# lemon/concept/bpugraph.h \
1.210 -# lemon/concept/graph.h \
1.211 -# lemon/concept/graph_component.h \
1.212 -# lemon/concept/heap.h \
1.213 -# lemon/concept/maps.h \
1.214 -# lemon/concept/matrix_maps.h \
1.215 -# lemon/concept/path.h \
1.216 -# lemon/concept/ugraph.h
1.217 +concept_HEADERS +=
1.218 +## lemon/concept_check.h \
1.219 +## lemon/concept/bpugraph.h \
1.220 +## lemon/concept/graph.h \
1.221 +## lemon/concept/graph_component.h \
1.222 +## lemon/concept/heap.h \
1.223 +## lemon/concept/maps.h \
1.224 +## lemon/concept/matrix_maps.h \
1.225 +## lemon/concept/path.h \
1.226 +## lemon/concept/ugraph.h