Skip to content

Commit e7b4517

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #5564 from vtjnash/jn/build-exe
Add $(EXE) suffix to executables in Makefiles
2 parents 788d544 + 8af8d8f commit e7b4517

6 files changed

Lines changed: 269 additions & 260 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.dylib
55
*.def
66
*.o
7+
*.exe
78
*.out
89
*.tmp
910
lapack-3.1.1

‎Makefile.install‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -269,93 +269,93 @@ endif
269269

270270
install_tests : lib.grd
271271
ifneq ($(ONLY_CBLAS), 1)
272-
@install -m 666 utest/openblas_utest $(DESTDIR)$(OPENBLAS_BINARY_DIR)
273-
@install -m 666 utest/openblas_utest_ext $(DESTDIR)$(OPENBLAS_BINARY_DIR)
272+
@install -m 666 utest/openblas_utest$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
273+
@install -m 666 utest/openblas_utest_ext$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
274274
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
275275
ifndef NO_FBLAS
276276
ifeq ($(BUILD_BFLOAT16),1)
277-
@install -m 666 test/test_sbgemm $(DESTDIR)$(OPENBLAS_BINARY_DIR)
277+
@install -m 666 test/test_sbgemm$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
278278
endif
279279
ifeq ($(BUILD_SINGLE),1)
280-
@install -m 666 test/sblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
281-
@install -m 666 test/sblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
282-
@install -m 666 test/sblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
280+
@install -m 666 test/sblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
281+
@install -m 666 test/sblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
282+
@install -m 666 test/sblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
283283
@install -m 666 test/sblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
284284
@install -m 666 test/sblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
285285
endif
286286
ifeq ($(BUILD_DOUBLE),1)
287-
@install -m 666 test/dblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
288-
@install -m 666 test/dblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
289-
@install -m 666 test/dblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
287+
@install -m 666 test/dblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
288+
@install -m 666 test/dblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
289+
@install -m 666 test/dblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
290290
@install -m 666 test/dblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
291291
@install -m 666 test/dblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
292292
endif
293293
ifeq ($(BUILD_COMPLEX),1)
294-
@install -m 666 test/cblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
295-
@install -m 666 test/cblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
296-
@install -m 666 test/cblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
294+
@install -m 666 test/cblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
295+
@install -m 666 test/cblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
296+
@install -m 666 test/cblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
297297
@install -m 666 test/cblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
298298
@install -m 666 test/cblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
299299
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
300-
@install -m 666 test/cblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
300+
@install -m 666 test/cblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
301301
@install -m 666 test/cblat3_3m.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
302302
endif
303303
endif
304304
ifeq ($(BUILD_COMPLEX16),1)
305-
@install -m 666 test/zblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
306-
@install -m 666 test/zblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
307-
@install -m 666 test/zblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
305+
@install -m 666 test/zblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
306+
@install -m 666 test/zblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
307+
@install -m 666 test/zblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
308308
@install -m 666 test/zblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
309309
@install -m 666 test/zblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
310310
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
311-
@install -m 666 test/zblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
311+
@install -m 666 test/zblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
312312
@install -m 666 test/zblat3_3m.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
313313
endif
314314
endif
315315
endif
316316
endif
317317
ifneq ($(ONLY_CBLAS), 1)
318318
ifeq ($(BUILD_SINGLE),1)
319-
@install -m 666 ctest/xscblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
320-
@install -m 666 ctest/xscblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
321-
@install -m 666 ctest/xscblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
319+
@install -m 666 ctest/xscblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
320+
@install -m 666 ctest/xscblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
321+
@install -m 666 ctest/xscblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
322322
@install -m 666 ctest/sin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
323323
@install -m 666 ctest/sin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
324324
endif
325325
ifeq ($(BUILD_DOUBLE),1)
326-
@install -m 666 ctest/xdcblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
327-
@install -m 666 ctest/xdcblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
328-
@install -m 666 ctest/xdcblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
326+
@install -m 666 ctest/xdcblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
327+
@install -m 666 ctest/xdcblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
328+
@install -m 666 ctest/xdcblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
329329
@install -m 666 ctest/din2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
330330
@install -m 666 ctest/din3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
331331
endif
332332
ifeq ($(BUILD_COMPLEX),1)
333-
@install -m 666 ctest/xccblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
334-
@install -m 666 ctest/xccblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
335-
@install -m 666 ctest/xccblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
333+
@install -m 666 ctest/xccblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
334+
@install -m 666 ctest/xccblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
335+
@install -m 666 ctest/xccblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
336336
@install -m 666 ctest/cin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
337337
@install -m 666 ctest/cin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
338338
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
339-
@install -m 666 ctest/xccblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
339+
@install -m 666 ctest/xccblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
340340
@install -m 666 ctest/cin3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
341341
endif
342342
endif
343343
ifeq ($(BUILD_COMPLEX16),1)
344-
@install -m 666 ctest/xzcblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
345-
@install -m 666 ctest/xzcblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
346-
@install -m 666 ctest/xzcblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
344+
@install -m 666 ctest/xzcblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
345+
@install -m 666 ctest/xzcblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
346+
@install -m 666 ctest/xzcblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
347347
@install -m 666 ctest/zin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
348348
@install -m 666 ctest/zin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
349349
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
350-
@install -m 666 ctest/xzcblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
350+
@install -m 666 ctest/xzcblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
351351
@install -m 666 ctest/zin3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
352352
endif
353353
endif
354354

355355
endif
356356
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
357-
@install -m 666 cpp_thread_test/dgemm_tester $(DESTDIR)$(OPENBLAS_BINARY_DIR)
358-
@install -m 666 cpp_thread_test/dgemm_mixed_tester $(DESTDIR)$(OPENBLAS_BINARY_DIR)
359-
@install -m 666 cpp_thread_test/dgemv_tester $(DESTDIR)$(OPENBLAS_BINARY_DIR)
357+
@install -m 666 cpp_thread_test/dgemm_tester$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
358+
@install -m 666 cpp_thread_test/dgemm_mixed_tester$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
359+
@install -m 666 cpp_thread_test/dgemv_tester$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
360360
endif
361361
endif

‎Makefile.system‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,6 +1822,14 @@ ifndef LIBSUFFIX
18221822
LIBSUFFIX = a
18231823
endif
18241824

1825+
ifndef EXE
1826+
ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))
1827+
EXE = .exe
1828+
else
1829+
EXE =
1830+
endif
1831+
endif
1832+
18251833
ifneq ($(DYNAMIC_ARCH), 1)
18261834
ifndef SMP
18271835
LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)

0 commit comments

Comments
 (0)