Changeset 964:2b6bffe0e7e8 in lemon-main for lemon/Makefile.am

Timestamp:

12/20/11 18:15:14 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

963:7c4ba7daaf5f (diff), 942:633956ca9421 (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

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/Makefile.am (modified) (6 diffs)

lemon/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
         lemon/lemon.pc.in \
+        lemon/lemon.pc.cmake \
         lemon/CMakeLists.txt \
         lemon/config.h.cmake

lemon/Makefile.am

@@ -59 +59 @@
         lemon/arg_parser.h \
         lemon/assert.h \
+        lemon/bellman_ford.h \
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/binomial_heap.h \
         lemon/bucket_heap.h \
+        lemon/capacity_scaling.h \
         lemon/cbc.h \
         lemon/circulation.h \
@@ -68 +71 @@
         lemon/concept_check.h \
         lemon/connectivity.h \
+        lemon/core.h \
+        lemon/cost_scaling.h \
         lemon/counter.h \
-        lemon/core.h \
         lemon/cplex.h \
+        lemon/cycle_canceling.h \
         lemon/dfs.h \
+        lemon/dheap.h \
         lemon/dijkstra.h \
         lemon/dim2.h \
@@ -80 +86 @@
         lemon/euler.h \
         lemon/fib_heap.h \
+        lemon/fractional_matching.h \
         lemon/full_graph.h \
         lemon/glpk.h \
@@ -85 +92 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hartmann_orlin_mmc.h \
+        lemon/howard_mmc.h \
         lemon/hypercube_graph.h \
+        lemon/karp_mmc.h \
         lemon/kruskal.h \
         lemon/hao_orlin.h \
@@ -100 +110 @@
         lemon/nauty_reader.h \
         lemon/network_simplex.h \
+        lemon/pairing_heap.h \
         lemon/path.h \
+        lemon/planarity.h \
         lemon/preflow.h \
+        lemon/quad_heap.h \
         lemon/radix_heap.h \
         lemon/radix_sort.h \
@@ -107 +120 @@
         lemon/smart_graph.h \
         lemon/soplex.h \
+        lemon/static_graph.h \
         lemon/suurballe.h \
         lemon/time_measure.h \