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