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

Timestamp:

04/25/05 10:19:38 (19 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

Location:

src/demo

Files:

• Makefile.am (modified) (2 diffs)
• lp_demo.cc (modified) (1 diff)
• lp_maxflow_demo.cc (modified) (1 diff)

src/demo/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 LDADD = $(top_builddir)/src/lemon/libemon.la
-
-if HAVE_GLPK
-LP_CFLAGS = $(GLPK_CFLAGS) -DHAVE_GLPK
-LP_LIBS = $(GLPK_LIBS)
-else !HAVE_GLPK
-if HAVE_CPLEX
-LP_CFLAGS = $(CPLEX_CFLAGS) -DHAVE_CPLEX
-LP_LIBS = $(CPLEX_LIBS)
-endif HAVE_CPLEX
-endif !HAVE_GLPK
-
 
 EXTRA_DIST = sub_graph_wrapper_demo.dim
@@ -44 +33 @@
 
 lp_demo_SOURCES = lp_demo.cc
-lp_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_demo_LDFLAGS = $(LP_LIBS)
+lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
 
 lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
-lp_maxflow_demo_CXXFLAGS = $(LP_CFLAGS)
-lp_maxflow_demo_LDFLAGS = $(LP_LIBS)
+lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)

src/demo/lp_demo.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <iostream>
 

src/demo/lp_maxflow_demo.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include<lemon/graph_reader.h>
 #include<lemon/list_graph.h>