Browse Source

move glpk library flags to GLPK_LDFLAGS

Samuel Thibault 14 years ago
parent
commit
b38efd34e4
3 changed files with 5 additions and 5 deletions
  1. 1 1
      configure.ac
  2. 3 3
      mpi/Makefile.am
  3. 1 1
      src/Makefile.am

+ 1 - 1
configure.ac

@@ -856,7 +856,7 @@ if test x$enable_stats = xyes; then
 fi
 
 AC_CHECK_HEADERS([glpk.h])
-AC_HAVE_LIBRARY([glpk])
+STARPU_HAVE_LIBRARY(GLPK, [glpk])
 
 ###############################################################################
 #                                                                             #

+ 3 - 3
mpi/Makefile.am

@@ -48,7 +48,7 @@ if STARPU_USE_CUDA
 # TODO define NVCCFLAGS
 NVCC ?= nvcc
 
-NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include $(HWLOC_CFLAGS)
+NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include
 
 .cu.cubin:
 	$(MKDIR_P) `dirname $@`
@@ -58,8 +58,8 @@ NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include $(HWLOC_CFLAGS)
 	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/  -I$(top_builddir)/include/
 endif
 
-AM_CFLAGS = $(HWLOC_CFLAGS) -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS)
-LIBS = $(top_builddir)/src/libstarpu.la $(HWLOC_LIBS) @LIBS@ $(FXT_LIBS)
+AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS)
+LIBS = $(top_builddir)/src/libstarpu.la @LIBS@ $(FXT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/mpi/ -I$(top_srcdir)/src/  -I$(top_srcdir)/examples/ -I$(top_builddir)/src -I$(top_builddir)/include
 AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS)
 

+ 1 - 1
src/Makefile.am

@@ -49,7 +49,7 @@ lib_LTLIBRARIES = libstarpu.la
 libstarpu_la_CPPFLAGS = -I$(top_srcdir)/include/
 
 libstarpu_la_CFLAGS = $(GLOBAL_AM_CFLAGS) $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS)
-libstarpu_la_LIBADD = -lm $(HWLOC_LIBS) $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS) $(FXT_LIBS)
+libstarpu_la_LIBADD = -lm $(HWLOC_LIBS) $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS) $(FXT_LIBS) $(GLPK_LDFLAGS)
 libstarpu_la_LDFLAGS = $(ldflags) -version-number 0:0:0 -no-undefined
 
 noinst_HEADERS = 						\