Skip to content

Commit a40116d

Browse files
committed
Fixed generating DLL bug.
1 parent b31ec99 commit a40116d

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

Makefile.install

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ install : lib.grd
2020
@-mkdir -p $(DESTDIR)$(PREFIX)
2121
@-mkdir -p $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
2222
@-mkdir -p $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
23+
@-mkdir -p $(DESTDIR)$(OPENBLAS_BINARY_DIR)
2324
@echo Generating openblas_config.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
2425
#for inc
2526
@echo \#ifndef OPENBLAS_CONFIG_H > $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@@ -82,7 +83,7 @@ ifeq ($(OSNAME), Darwin)
8283
endif
8384
ifeq ($(OSNAME), WINNT)
8485
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
85-
@-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR)
86+
@-cp $(LIBPREFIX).lib $(OPENBLAS_LIBRARY_DIR)
8687
endif
8788
ifeq ($(OSNAME), CYGWIN_NT)
8889
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)

exports/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dll : ../$(LIBDLLNAME)
8484
../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX)
8585
$(RANLIB) ../$(LIBNAME)
8686
$(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \
87-
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \
87+
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBPREFIX).lib \
8888
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB)
8989

9090
libopenblas.def : gensymbol

lapack-netlib/SRC/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ include ../make.inc
5454
#
5555
#######################################################################
5656

57-
ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o \
57+
ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla_array.o iparmq.o \
5858
ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
59-
../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
59+
../INSTALL/ilaver.o ../INSTALL/slamch.o
6060

6161
SCLAUX = \
6262
sbdsdc.o \
@@ -213,11 +213,11 @@ CLASRC = \
213213
cposv.o cposvx.o cpstrf.o cpstf2.o \
214214
cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o \
215215
cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o cpttrs.o cptts2.o \
216-
crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
216+
crot.o cspcon.o csprfs.o cspsv.o \
217217
cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
218218
cstegr.o cstein.o csteqr.o \
219-
csycon.o csymv.o \
220-
csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
219+
csycon.o \
220+
csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
221221
csyswapr.o csytrs.o csytrs2.o csyconv.o \
222222
csytf2_rook.o csytrf_rook.o csytrs_rook.o \
223223
csytri_rook.o csycon_rook.o csysv_rook.o \
@@ -375,11 +375,11 @@ ZLASRC = \
375375
zposv.o zposvx.o zpotrs.o zpstrf.o zpstf2.o \
376376
zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \
377377
zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o zpttrs.o zptts2.o \
378-
zrot.o zspcon.o zspmv.o zspr.o zsprfs.o zspsv.o \
378+
zrot.o zspcon.o zsprfs.o zspsv.o \
379379
zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
380380
zstegr.o zstein.o zsteqr.o \
381-
zsycon.o zsymv.o \
382-
zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
381+
zsycon.o \
382+
zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
383383
zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o \
384384
zsytf2_rook.o zsytrf_rook.o zsytrs_rook.o \
385385
zsytri_rook.o zsycon_rook.o zsysv_rook.o \

0 commit comments

Comments
 (0)