[PPL-devel] [GIT] ppl/ppl(sparse_matrices): Use a convenience library to confine the compilation of glpk_set_d_eps.c.

Roberto Bagnara bagnara at cs.unipr.it
Mon Aug 30 09:24:07 CEST 2010


Module: ppl/ppl
Branch: sparse_matrices
Commit: eac65c875791c7ad6065a918cada3783f487f706
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eac65c875791c7ad6065a918cada3783f487f706

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Mon Aug 30 09:20:53 2010 +0200

Use a convenience library to confine the compilation of glpk_set_d_eps.c.

---

 demos/ppl_lpsol/Makefile.am |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/demos/ppl_lpsol/Makefile.am b/demos/ppl_lpsol/Makefile.am
index a8c234f..1365fa2 100644
--- a/demos/ppl_lpsol/Makefile.am
+++ b/demos/ppl_lpsol/Makefile.am
@@ -42,27 +42,31 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/interfaces/C \
 @extra_includes@
 
-if GCC
-
-# We cannot use -std=c89 because of the definition of sigaction in <signal.h>.
-AM_CFLAGS = -pedantic -std=gnu89 -Werror
-
-endif GCC
-
 bin_PROGRAMS = ppl_lpsol
 
 # dummy.cc serves the only purpose to force linking using the C++ compiler.
 ppl_lpsol_SOURCES = \
 ppl_lpsol.c \
-glpk_set_d_eps.c \
 dummy.cc
 
+if GCC
+
+# We cannot use -std=c89 because of the definition of sigaction in <signal.h>.
+ppl_lpsol_CFLAGS = -pedantic -std=gnu89 -Werror
+
+endif GCC
+
 ppl_lpsol_LDADD = \
+libglpk_set_d_eps.a \
 -lglpk \
 $(top_builddir)/interfaces/C/libppl_c.la \
 $(top_builddir)/src/libppl.la \
 @extra_libraries@
 
+noinst_LIBRARIES = libglpk_set_d_eps.a
+libglpk_set_d_eps_a_SOURCES = \
+glpk_set_d_eps.c
+
 dist_man_MANS = \
 ppl_lpsol.1
 




More information about the PPL-devel mailing list