소스 검색

Makefile.am: fix settings of check_PROGRAMS
- setting it first causes errors such as 'XXXXX_OBJECTS should not be defined'

Nathalie Furmento 14 년 전
부모
커밋
598d2ad410
2개의 변경된 파일8개의 추가작업 그리고 12개의 파일을 삭제
  1. 5 6
      examples/Makefile.am
  2. 3 6
      tests/Makefile.am

+ 5 - 6
examples/Makefile.am

@@ -119,7 +119,7 @@ noinst_HEADERS = 				\
 	spmv/spmv.h				\
 	spmv/dw_block_spmv.h
 
-check_PROGRAMS +=				\
+examplebin_PROGRAMS +=				\
 	basic_examples/hello_world		\
 	basic_examples/vector_scal		\
 	basic_examples/mult			\
@@ -145,12 +145,12 @@ check_PROGRAMS +=				\
 #	ppm_downscaler/yuv_downscaler
 
 if STARPU_HAVE_F77_H
-check_PROGRAMS +=				\
+examplebin_PROGRAMS +=				\
 	basic_examples/vector_scal_fortran
 endif
 
 if !NO_BLAS_LIB
-check_PROGRAMS +=				\
+examplebin_PROGRAMS +=				\
 	axpy/axpy				\
 	mult/sgemm 				\
 	mult/dgemm				\
@@ -167,12 +167,11 @@ check_PROGRAMS +=				\
 endif
 
 if ATLAS_BLAS_LIB
-check_PROGRAMS += 				\
+examplebin_PROGRAMS +=				\
 	spmv/dw_block_spmv
 endif
 
-examplebin_PROGRAMS +=				\
-	$(check_PROGRAMS)
+check_PROGRAMS +=	$(examplebin_PROGRAMS)
 
 ##################
 # Basic examples #

+ 3 - 6
tests/Makefile.am

@@ -74,7 +74,6 @@ endif
 
 
 testbindir = $(libdir)/starpu/tests
-testbin_PROGRAMS =
 
 SUBDIRS =
 
@@ -84,9 +83,7 @@ if STARPU_COVERAGE_ENABLED
 TESTS	+=	coverage/coverage.sh
 endif
 
-check_PROGRAMS =
-
-check_PROGRAMS += 				\
+testbin_PROGRAMS =				\
 	core/restart				\
 	core/execute_on_a_specific_worker	\
 	core/insert_task			\
@@ -159,8 +156,8 @@ check_PROGRAMS += 				\
 	perfmodels/regression_based		\
 	perfmodels/non_linear_regression_based
 
-testbin_PROGRAMS +=				\
-	$(check_PROGRAMS)
+check_PROGRAMS =
+	$(testbin_PROGRAMS)
 
 datawizard_acquire_release_SOURCES =		\
 	datawizard/acquire_release.c