Skip to content

Commit a133637

Browse files
vtjnashclaude
vtjnash
and
claude
committed
Add $(EXE) suffix to executables in Makefiles
Define EXE variable in Makefile.system (set to .exe on Windows, empty otherwise) and update all test executables to use it for Windows compatibility. - Makefile.system: Add EXE variable definition - test/Makefile: Update all executables with $(EXE) suffix - ctest/Makefile: Update all executables with $(EXE) suffix - utest/Makefile: Update UTESTBIN and UTESTEXTBIN with $(EXE) suffix - Makefile.install: Update install_tests target with $(EXE) suffix - .gitignore: Add *.exe pattern Co-Authored-By: Claude Opus 4.5 <[email protected]>
1 parent 68ff451 commit a133637

File tree

6 files changed

+274
-265
lines changed

6 files changed

+274
-265
lines changed

‎.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: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -253,93 +253,93 @@ endif
253253

254254
install_tests : lib.grd
255255
ifneq ($(ONLY_CBLAS), 1)
256-
@install -m 666 utest/openblas_utest $(DESTDIR)$(OPENBLAS_BINARY_DIR)
257-
@install -m 666 utest/openblas_utest_ext $(DESTDIR)$(OPENBLAS_BINARY_DIR)
256+
@install -m 666 utest/openblas_utest$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
257+
@install -m 666 utest/openblas_utest_ext$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
258258
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
259259
ifndef NO_FBLAS
260260
ifeq ($(BUILD_BFLOAT16),1)
261-
@install -m 666 test/test_sbgemm $(DESTDIR)$(OPENBLAS_BINARY_DIR)
261+
@install -m 666 test/test_sbgemm$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
262262
endif
263263
ifeq ($(BUILD_SINGLE),1)
264-
@install -m 666 test/sblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
265-
@install -m 666 test/sblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
266-
@install -m 666 test/sblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
264+
@install -m 666 test/sblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
265+
@install -m 666 test/sblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
266+
@install -m 666 test/sblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
267267
@install -m 666 test/sblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
268268
@install -m 666 test/sblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
269269
endif
270270
ifeq ($(BUILD_DOUBLE),1)
271-
@install -m 666 test/dblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
272-
@install -m 666 test/dblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
273-
@install -m 666 test/dblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
271+
@install -m 666 test/dblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
272+
@install -m 666 test/dblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
273+
@install -m 666 test/dblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
274274
@install -m 666 test/dblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
275275
@install -m 666 test/dblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
276276
endif
277277
ifeq ($(BUILD_COMPLEX),1)
278-
@install -m 666 test/cblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
279-
@install -m 666 test/cblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
280-
@install -m 666 test/cblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
278+
@install -m 666 test/cblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
279+
@install -m 666 test/cblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
280+
@install -m 666 test/cblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
281281
@install -m 666 test/cblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
282282
@install -m 666 test/cblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
283283
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
284-
@install -m 666 test/cblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
284+
@install -m 666 test/cblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
285285
@install -m 666 test/cblat3_3m.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
286286
endif
287287
endif
288288
ifeq ($(BUILD_COMPLEX16),1)
289-
@install -m 666 test/zblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
290-
@install -m 666 test/zblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
291-
@install -m 666 test/zblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
289+
@install -m 666 test/zblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
290+
@install -m 666 test/zblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
291+
@install -m 666 test/zblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
292292
@install -m 666 test/zblat2.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
293293
@install -m 666 test/zblat3.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
294294
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
295-
@install -m 666 test/zblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
295+
@install -m 666 test/zblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
296296
@install -m 666 test/zblat3_3m.dat $(DESTDIR)$(OPENBLAS_BINARY_DIR)
297297
endif
298298
endif
299299
endif
300300
endif
301301
ifneq ($(ONLY_CBLAS), 1)
302302
ifeq ($(BUILD_SINGLE),1)
303-
@install -m 666 ctest/xscblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
304-
@install -m 666 ctest/xscblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
305-
@install -m 666 ctest/xscblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
303+
@install -m 666 ctest/xscblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
304+
@install -m 666 ctest/xscblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
305+
@install -m 666 ctest/xscblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
306306
@install -m 666 ctest/sin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
307307
@install -m 666 ctest/sin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
308308
endif
309309
ifeq ($(BUILD_DOUBLE),1)
310-
@install -m 666 ctest/xdcblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
311-
@install -m 666 ctest/xdcblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
312-
@install -m 666 ctest/xdcblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
310+
@install -m 666 ctest/xdcblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
311+
@install -m 666 ctest/xdcblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
312+
@install -m 666 ctest/xdcblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
313313
@install -m 666 ctest/din2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
314314
@install -m 666 ctest/din3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
315315
endif
316316
ifeq ($(BUILD_COMPLEX),1)
317-
@install -m 666 ctest/xccblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
318-
@install -m 666 ctest/xccblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
319-
@install -m 666 ctest/xccblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
317+
@install -m 666 ctest/xccblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
318+
@install -m 666 ctest/xccblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
319+
@install -m 666 ctest/xccblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
320320
@install -m 666 ctest/cin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
321321
@install -m 666 ctest/cin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
322322
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
323-
@install -m 666 ctest/xccblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
323+
@install -m 666 ctest/xccblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
324324
@install -m 666 ctest/cin3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
325325
endif
326326
endif
327327
ifeq ($(BUILD_COMPLEX16),1)
328-
@install -m 666 ctest/xzcblat1 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
329-
@install -m 666 ctest/xzcblat2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
330-
@install -m 666 ctest/xzcblat3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
328+
@install -m 666 ctest/xzcblat1$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
329+
@install -m 666 ctest/xzcblat2$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
330+
@install -m 666 ctest/xzcblat3$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
331331
@install -m 666 ctest/zin2 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
332332
@install -m 666 ctest/zin3 $(DESTDIR)$(OPENBLAS_BINARY_DIR)
333333
ifeq ($(ARCH), filter($(ARCH), x86 x86_64 ia64 MIPS))
334-
@install -m 666 ctest/xzcblat3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
334+
@install -m 666 ctest/xzcblat3_3m$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
335335
@install -m 666 ctest/zin3_3m $(DESTDIR)$(OPENBLAS_BINARY_DIR)
336336
endif
337337
endif
338338

339339
endif
340340
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
341-
@install -m 666 cpp_thread_test/dgemm_tester $(DESTDIR)$(OPENBLAS_BINARY_DIR)
342-
@install -m 666 cpp_thread_test/dgemv_tester $(DESTDIR)$(OPENBLAS_BINARY_DIR)
341+
@install -m 666 cpp_thread_test/dgemm_tester$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
342+
@install -m 666 cpp_thread_test/dgemv_tester$(EXE) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
343343
endif
344344
endif
345345

‎Makefile.system‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ ifeq ($(OSNAME), WINNT)
477477
NEED_PIC = 0
478478
NO_EXPRECISION = 1
479479

480-
EXTRALIB += -defaultlib:advapi32
480+
#EXTRALIB += -defaultlib:advapi32
481481

482482
SUFFIX = obj
483483
PSUFFIX = pobj
@@ -1790,6 +1790,14 @@ ifndef LIBSUFFIX
17901790
LIBSUFFIX = a
17911791
endif
17921792

1793+
ifndef EXE
1794+
ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))
1795+
EXE = .exe
1796+
else
1797+
EXE =
1798+
endif
1799+
endif
1800+
17931801
ifneq ($(DYNAMIC_ARCH), 1)
17941802
ifndef SMP
17951803
LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)

0 commit comments

Comments
 (0)