COIN-OR::LEMON - Graph Library

Changeset 399:fc6954b4fce4 in lemon


Ignore:
Timestamp:
11/21/08 11:49:39 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
400:50d96f2166d7, 404:660db48f324f, 414:5a7dbeaed70e
Parents:
392:80ec623f529f (diff), 398: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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r378 r399  
    2828        lemon/dijkstra.h \
    2929        lemon/dim2.h \
     30        lemon/elevator.h \
    3031        lemon/error.h \
    3132        lemon/full_graph.h \
  • lemon/Makefile.am

    r394 r399  
    1313        lemon/random.cc
    1414
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     15#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    1616#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
    1717
     
    3333        lemon/graph_to_eps.h \
    3434        lemon/grid_graph.h \
     35        lemon/hypercube_graph.h \
    3536        lemon/kruskal.h \
    3637        lemon/lgf_reader.h \
Note: See TracChangeset for help on using the changeset viewer.