Skip to content

Commit 63fbffd

Browse files
authored
Add option FIXED_LIBNAME to suppress versioning and softlinking
1 parent e5d2725 commit 63fbffd

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

Makefile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
TOPDIR = .
22
include ./Makefile.system
3+
LNCMD = ln -fs
4+
ifeq ($(FIXED_LIBNAME), 1)
5+
LNCMD = true
6+
endif
37

48
BLASDIRS = interface driver/level2 driver/level3 driver/others
59

@@ -134,17 +138,17 @@ shared : libs netlib $(RELA)
134138
ifneq ($(NO_SHARED), 1)
135139
ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
136140
@$(MAKE) -C exports so
137-
@ln -fs $(LIBSONAME) $(LIBPREFIX).so
138-
@ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
141+
@$(LNCMD) $(LIBSONAME) $(LIBPREFIX).so
142+
@$(LNCMD) $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
139143
endif
140144
ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
141145
@$(MAKE) -C exports so
142-
@ln -fs $(LIBSONAME) $(LIBPREFIX).so
146+
@$(LNCMD) $(LIBSONAME) $(LIBPREFIX).so
143147
endif
144148
ifeq ($(OSNAME), Darwin)
145149
@$(MAKE) -C exports dyn
146-
@ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
147-
@ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
150+
@$(LNCMD) $(LIBDYNNAME) $(LIBPREFIX).dylib
151+
@$(LNCMD) $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
148152
endif
149153
ifeq ($(OSNAME), WINNT)
150154
@$(MAKE) -C exports dll
@@ -229,13 +233,13 @@ ifeq ($(INTERFACE64),1)
229233
endif
230234
@echo THELIBNAME=$(LIBNAME) >> Makefile.conf_last
231235
@echo THELIBSONAME=$(LIBSONAME) >> Makefile.conf_last
232-
@-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
236+
@-$(LNCMD) $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
233237
@touch lib.grd
234238

235239
prof : prof_blas prof_lapack
236240

237241
prof_blas :
238-
ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
242+
$(LNCMD) $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
239243
for d in $(SUBDIRS) ; \
240244
do if test -d $$d; then \
241245
$(MAKE) -C $$d prof || exit 1 ; \
@@ -246,15 +250,15 @@ ifeq ($(DYNAMIC_ARCH), 1)
246250
endif
247251

248252
blas :
249-
ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
253+
$(LNCMD) $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
250254
for d in $(BLASDIRS) ; \
251255
do if test -d $$d; then \
252256
$(MAKE) -C $$d libs || exit 1 ; \
253257
fi; \
254258
done
255259

256260
hpl :
257-
ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
261+
$(LNCMD) $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
258262
for d in $(BLASDIRS) ../laswp exports ; \
259263
do if test -d $$d; then \
260264
$(MAKE) -C $$d $(@F) || exit 1 ; \
@@ -268,7 +272,7 @@ ifeq ($(DYNAMIC_ARCH), 1)
268272
endif
269273

270274
hpl_p :
271-
ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
275+
$(LNCMD) $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
272276
for d in $(SUBDIRS) ../laswp exports ; \
273277
do if test -d $$d; then \
274278
$(MAKE) -C $$d $(@F) || exit 1 ; \
@@ -401,6 +405,7 @@ lapack-runtest: lapack-test
401405

402406
blas-test:
403407
(cd $(NETLIB_LAPACK_DIR)/BLAS/TESTING && rm -f x* *.out)
408+
404409
$(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR) blas_testing
405410
(cd $(NETLIB_LAPACK_DIR)/BLAS/TESTING && cat *.out)
406411

Makefile.system

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,10 @@ LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
17041704
endif
17051705
endif
17061706

1707+
ifeq ($(FIXED_LIBNAME),1)
1708+
LIBNAME = $(LIBPREFIX).$(LIBSUFFIX)
1709+
LIBNAME_P = $(LIBPREFIX)_p.$(LIBSUFFIX)
1710+
endif
17071711

17081712
LIBDLLNAME = $(LIBPREFIX).dll
17091713
IMPLIBNAME = lib$(LIBNAMEBASE).dll.a

0 commit comments

Comments
 (0)