Selaa lähdekoodia

Fix make distcheck

Cédric Augonnet 14 vuotta sitten
vanhempi
commit
e972e93da4
3 muutettua tiedostoa jossa 7 lisäystä ja 12 poistoa
  1. 2 2
      configure.ac
  2. 3 9
      examples/Makefile.am
  3. 2 1
      tests/Makefile.am

+ 2 - 2
configure.ac

@@ -976,8 +976,8 @@ if test x$have_f77_h = xyes; then
         AC_DEFINE([STARPU_HAVE_F77_H], [1], [Define to 1 if you have the <f77.h> header file.])
 fi
 
-AC_CONFIG_COMMANDS([executable-scripts], [chmod +x ]tests/regression/regression.sh tests/coverage/coverage_test.sh)
-AC_CONFIG_FILES(tests/regression/regression.sh tests/regression/profiles tests/regression/profiles.build.only tests/coverage/coverage_test.sh)
+AC_CONFIG_COMMANDS([executable-scripts], [chmod +x ]tests/regression/regression.sh)
+AC_CONFIG_FILES(tests/regression/regression.sh tests/regression/profiles tests/regression/profiles.build.only)
 AC_CONFIG_HEADER(src/common/config.h include/starpu_config.h)
 
 AC_OUTPUT([

+ 3 - 9
examples/Makefile.am

@@ -53,8 +53,7 @@ EXTRA_DIST = 					\
 	basic_examples/variable_kernels_opencl_codelet.cl	\
 	matvecmult/matvecmult_kernel.cl				\
 	basic_examples/block_opencl_kernel.cl			\
-	filters/fblock_opencl_codelet.cl			\
-	coverage/coverage.sh
+	filters/fblock_opencl_codelet.cl
 
 CLEANFILES = 					\
 	gordon/null_kernel_gordon.spuelf	\
@@ -65,15 +64,10 @@ CLEANFILES += *.gcno *.gcda *.linkinfo
 
 if STARPU_USE_CUDA
 
-NVCCFLAGS += $(HWLOC_CFLAGS)
-
-.cu.cubin:
-	$(MKDIR_P) `dirname $@`
-	$(NVCC) -cubin $< -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS)
+NVCCFLAGS += --compiler-options -fno-strict-aliasing  $(HWLOC_CFLAGS) -I$(top_srcdir)/include/ -I$(top_builddir)/include/ -I$(top_srcdir)/examples/
 
 .cu.o:
-	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/ -I$(top_builddir)/include/
-
+	$(NVCC) $< -c -o $@ $(NVCCFLAGS)
 
 endif
 

+ 2 - 1
tests/Makefile.am

@@ -21,7 +21,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/src/
 EXTRA_DIST =					\
 	microbenchs/null_kernel_gordon.c	\
 	datawizard/sync_and_notify_data_gordon_kernels.c \
-	datawizard/sync_and_notify_data_opencl_codelet.cl
+	datawizard/sync_and_notify_data_opencl_codelet.cl\
+	coverage/coverage.sh
 
 CLEANFILES = 					\
 	*.gcno *.gcda *.linkinfo		\