Changeset 384:fc6954b4fce4 in lemon-main

Timestamp:

11/21/08 11:49:39 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

385:50d96f2166d7, 389:660db48f324f, 399:5a7dbeaed70e

Parents:

378:80ec623f529f (diff), 383:a8a22a96d495 (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) (2 diffs)

lemon/Makefile.am

@@ -28 +28 @@
         lemon/dijkstra.h \
         lemon/dim2.h \
+        lemon/elevator.h \
         lemon/error.h \
         lemon/full_graph.h \

lemon/Makefile.am

@@ -13 +13 @@
         lemon/random.cc
 
-#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
+#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 
@@ -33 +33 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hypercube_graph.h \
         lemon/kruskal.h \
         lemon/lgf_reader.h \