Skip to content

Commit 8396e9e

Browse files
authored
Handle NOFORTRAN=0
1 parent c38c65e commit 8396e9e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ endif
5858
endif
5959

6060
@echo " C compiler ... $(C_COMPILER) (command line : $(CC))"
61-
ifneq ($(NOFORTRAN), $(filter-out $(NOFORTRAN), 1 2))
61+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
6262
@echo " Fortran compiler ... $(F_COMPILER) (command line : $(FC))"
6363
endif
6464
ifneq ($(OSNAME), AIX)
@@ -119,7 +119,7 @@ endif
119119
endif
120120

121121
tests :
122-
ifneq ($(NOFORTRAN), $(filter-out $(NOFORTRAN), 1 2))
122+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
123123
touch $(LIBNAME)
124124
ifndef NO_FBLAS
125125
$(MAKE) -C test all
@@ -221,7 +221,7 @@ netlib :
221221

222222
else
223223
netlib : lapack_prebuild
224-
ifneq ($(NOFORTRAN), $(filter-out $(NOFORTRAN), 1 2))
224+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
225225
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
226226
@$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
227227
endif
@@ -242,10 +242,10 @@ prof_lapack : lapack_prebuild
242242
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
243243

244244
lapack_prebuild :
245-
$(info filter value of NOFORTRAN is:)
246-
$(info x$(filter-out $(NOFORTRAN), 1 2)x)
245+
$(info filter value of x$(NOFORTRAN)x is:)
246+
$(info x$(filter 0,$(NOFORTRAN))x)
247247

248-
ifneq ($(NOFORTRAN), $(filter-out $(NOFORTRAN), 1 2))
248+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
249249
-@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
250250
-@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
251251
-@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
@@ -288,21 +288,21 @@ endif
288288
endif
289289

290290
large.tgz :
291-
ifneq ($(NOFORTRAN), $(filter $(NOFORTRAN), 1 2))
291+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
292292
if [ ! -a $< ]; then
293293
-wget http://www.netlib.org/lapack/timing/large.tgz;
294294
fi
295295
endif
296296

297297
timing.tgz :
298-
ifneq ($(NOFORTRAN), $(filter $(NOFORTRAN), 1 2))
298+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
299299
if [ ! -a $< ]; then
300300
-wget http://www.netlib.org/lapack/timing/timing.tgz;
301301
fi
302302
endif
303303

304304
lapack-timing : large.tgz timing.tgz
305-
ifneq ($(NOFORTRAN), $(filter $(NOFORTRAN), 1 2))
305+
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
306306
(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
307307
(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
308308
$(MAKE) -C $(NETLIB_LAPACK_DIR)/TIMING

0 commit comments

Comments
 (0)