[Lemon-commits] [lemon_svn] ladanyi: r1839 - hugo/trunk/src/lemon

[Lemon SVN]

Author: ladanyi
Date: Mon Apr 25 00:30:54 2005
New Revision: 1839

Modified:
   hugo/trunk/src/lemon/Makefile.am

Log:
This way it works also when both GLPK and CPLEX are enabled.


Modified: hugo/trunk/src/lemon/Makefile.am
==============================================================================
--- hugo/trunk/src/lemon/Makefile.am	(original)
+++ hugo/trunk/src/lemon/Makefile.am	Mon Apr 25 00:30:54 2005
@@ -8,17 +8,15 @@
 libemon_la_SOURCES = \
 	lp_base.cc \
 	lp_skeleton.cc
+libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
 
 if HAVE_GLPK
 libemon_la_SOURCES += lp_glpk.cc
-libemon_la_CXXFLAGS = $(GLPK_CFLAGS)
-libemon_la_LDFLAGS = $(GLPK_LIBS)
 endif
 
 if HAVE_CPLEX
 libemon_la_SOURCES += lp_cplex.cc
-libemon_la_CXXFLAGS = $(CPLEX_CFLAGS)
-libemon_la_LDFLAGS = $(CPLEX_LIBS)
 endif
 
 nobase_pkginclude_HEADERS = \