COIN-OR::LEMON - Graph Library

Changeset 378:efbd0ab50a77 in lemon for lemon/Makefile.am


Ignore:
Timestamp:
11/06/08 15:40:32 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
379:9194a12c52e6, 380:a7e8ad460d66
Parents:
375:a637fb9d457b (diff), 377:a12eef1f82b2 (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

    r375 r378  
    3232        lemon/graph_to_eps.h \
    3333        lemon/grid_graph.h \
     34        lemon/hypercube_graph.h \
    3435        lemon/kruskal.h \
    3536        lemon/lgf_reader.h \
  • lemon/Makefile.am

    r376 r378  
    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
Note: See TracChangeset for help on using the changeset viewer.