COIN-OR::LEMON - Graph Library

Changeset 1387:37d1b20cd9ef in lemon-0.x for src/demo/Makefile.am


Ignore:
Timestamp:
04/25/05 10:19:38 (15 years ago)
Author:
Akos Ladanyi
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1840
Message:
  • include config.h instead of manually adding -DHAVE_{CPLEX,GLPK} to CXXFLAGS
  • removed the checking of LpSkeleton? from lp_test.cc, because it is an abstract base class now
  • removed unnecessary LDFLAGS when linking with libemon.la
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/demo/Makefile.am

    r1381 r1387  
    11AM_CPPFLAGS = -I$(top_srcdir)/src
    22LDADD = $(top_builddir)/src/lemon/libemon.la
    3 
    4 if HAVE_GLPK
    5 LP_CFLAGS = $(GLPK_CFLAGS) -DHAVE_GLPK
    6 LP_LIBS = $(GLPK_LIBS)
    7 else !HAVE_GLPK
    8 if HAVE_CPLEX
    9 LP_CFLAGS = $(CPLEX_CFLAGS) -DHAVE_CPLEX
    10 LP_LIBS = $(CPLEX_LIBS)
    11 endif HAVE_CPLEX
    12 endif !HAVE_GLPK
    13 
    143
    154EXTRA_DIST = sub_graph_wrapper_demo.dim
     
    4433
    4534lp_demo_SOURCES = lp_demo.cc
    46 lp_demo_CXXFLAGS = $(LP_CFLAGS)
    47 lp_demo_LDFLAGS = $(LP_LIBS)
     35lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
    4836
    4937lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
    50 lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
    51 lp_maxflow_demo_LDFLAGS = $(LP_LIBS)
     38lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.