Skip to content

Commit 867eee6

Browse files
authored
Merge pull request #3972 from h-vetinari/ifndef
remove unqualified ifndef's for NO_LAPACK(E)
2 parents c05da59 + f265951 commit 867eee6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Makefile.install

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ endif
7777
endif
7878

7979
ifneq ($(OSNAME), AIX)
80-
ifndef NO_LAPACKE
80+
ifneq ($(NO_LAPACKE), 1)
8181
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
8282
@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
8383
@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
@@ -127,7 +127,7 @@ endif
127127

128128
else
129129
#install on AIX has different options syntax
130-
ifndef NO_LAPACKE
130+
ifneq ($(NO_LAPACKE), 1)
131131
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
132132
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
133133
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"

driver/level2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ CBLASOBJS += \
9292
ctrsv_RUU.$(SUFFIX) ctrsv_RUN.$(SUFFIX) ctrsv_RLU.$(SUFFIX) ctrsv_RLN.$(SUFFIX) \
9393
ctrsv_CUU.$(SUFFIX) ctrsv_CUN.$(SUFFIX) ctrsv_CLU.$(SUFFIX) ctrsv_CLN.$(SUFFIX)
9494

95-
ifndef NO_LAPACK
95+
ifneq ($(NO_LAPACK), 1)
9696
CBLASOBJS += \
9797
cspmv_U.$(SUFFIX) cspmv_L.$(SUFFIX) \
9898
cspr_U.$(SUFFIX) cspr_L.$(SUFFIX) \

interface/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ dsymv.$(SUFFIX) dsymv.$(PSUFFIX) : symv.c
10211021
qsymv.$(SUFFIX) qsymv.$(PSUFFIX) : symv.c
10221022
$(CC) -c $(CFLAGS) $< -o $(@F)
10231023

1024-
ifndef NO_LAPACK
1024+
ifneq ($(NO_LAPACK), 1)
10251025
csymv.$(SUFFIX) csymv.$(PSUFFIX) : zsymv.c
10261026
$(CC) -c $(CFLAGS) $< -o $(@F)
10271027

@@ -1041,7 +1041,7 @@ dsyr.$(SUFFIX) dsyr.$(PSUFFIX) : syr.c
10411041
qsyr.$(SUFFIX) qsyr.$(PSUFFIX) : syr.c
10421042
$(CC) -c $(CFLAGS) $< -o $(@F)
10431043

1044-
ifndef NO_LAPACK
1044+
ifneq ($(NO_LAPACK), 1)
10451045
csyr.$(SUFFIX) csyr.$(PSUFFIX) : zsyr.c
10461046
$(CC) -c $(CFLAGS) $< -o $(@F)
10471047

@@ -1115,7 +1115,7 @@ dspmv.$(SUFFIX) dspmv.$(PSUFFIX) : spmv.c
11151115
qspmv.$(SUFFIX) qspmv.$(PSUFFIX) : spmv.c
11161116
$(CC) -c $(CFLAGS) $< -o $(@F)
11171117

1118-
ifndef NO_LAPACK
1118+
ifneq ($(NO_LAPACK), 1)
11191119
cspmv.$(SUFFIX) cspmv.$(PSUFFIX) : zspmv.c
11201120
$(CC) -c $(CFLAGS) $< -o $(@F)
11211121

@@ -1135,7 +1135,7 @@ dspr.$(SUFFIX) dspr.$(PSUFFIX) : spr.c
11351135
qspr.$(SUFFIX) qspr.$(PSUFFIX) : spr.c
11361136
$(CC) -c $(CFLAGS) $< -o $(@F)
11371137

1138-
ifndef NO_LAPACK
1138+
ifneq ($(NO_LAPACK), 1)
11391139
cspr.$(SUFFIX) cspr.$(PSUFFIX) : zspr.c
11401140
$(CC) -c $(CFLAGS) $< -o $(@F)
11411141

0 commit comments

Comments
 (0)