Skip to content

Commit 9bd6ebc

Browse files
committed
Merge pull request #37 from JuliaLang/soname
Build fixes
2 parents 71d942f + b462578 commit 9bd6ebc

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

Make.inc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ OS := $(shell uname)
44
VERSION = 0.1.0
55
VERSION_SPLIT = $(subst ., , $(VERSION))
66
DESTDIR =
7-
PREFIX = /usr/local
8-
libdir = $(PREFIX)/lib
7+
prefix = /usr/local
8+
libdir = $(prefix)/lib
9+
includedir = $(prefix)/include
910

1011
FC = gfortran
1112
FFLAGS += -O3
@@ -69,28 +70,29 @@ override OS=WINNT
6970
endif
7071
#keep these if statements these separate
7172
ifeq ($(OS), WINNT)
73+
SHLIB_EXT = dll
74+
SONAME_FLAG = -soname
7275
CFLAGS_add+=-nodefaultlibs
7376
FFLAGS+=-nodefaultlibs
7477
endif
7578

7679
ifeq ($(OS), Linux)
7780
SHLIB_EXT = so
81+
SONAME_FLAG = -soname
7882
CFLAGS_add+=-fPIC
7983
FFLAGS+=-fPIC
8084
endif
8185

8286
ifeq ($(OS), FreeBSD)
8387
SHLIB_EXT = so
88+
SONAME_FLAG = -soname
8489
CFLAGS_add+=-fPIC
8590
FFLAGS+=-fPIC
8691
endif
8792

8893
ifeq ($(OS), Darwin)
8994
SHLIB_EXT = dylib
95+
SONAME_FLAG = -install_name
9096
CFLAGS_add+=-fPIC
9197
FFLAGS+=-fPIC
9298
endif
93-
94-
ifeq ($(OS), WINNT)
95-
SHLIB_EXT = dll
96-
endif

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ all: libopenlibm.a libopenlibm.$(SHLIB_EXT)
2626
libopenlibm.a: $(OBJS)
2727
$(AR) -rcs libopenlibm.a $(OBJS)
2828
libopenlibm.$(SHLIB_EXT): $(OBJS)
29-
$(FC) -shared $(OBJS) $(LDFLAGS) -o libopenlibm.$(SHLIB_EXT).$(VERSION)
29+
$(FC) -shared $(OBJS) $(LDFLAGS) -Wl,$(SONAME_FLAG),libopenlibm.$(SHLIB_EXT).$(VERSION) -o libopenlibm.$(SHLIB_EXT).$(VERSION)
3030
ln -s libopenlibm.$(SHLIB_EXT).$(VERSION) libopenlibm.$(SHLIB_EXT).$(word 1,$(VERSION_SPLIT)).$(word 2,$(VERSION_SPLIT))
3131
ln -s libopenlibm.$(SHLIB_EXT).$(VERSION) libopenlibm.$(SHLIB_EXT).$(word 1,$(VERSION_SPLIT))
3232
ln -s libopenlibm.$(SHLIB_EXT).$(VERSION) libopenlibm.$(SHLIB_EXT)
@@ -43,6 +43,6 @@ distclean:
4343

4444
install: all
4545
mkdir -p $(DESTDIR)$(libdir)
46-
mkdir -p $(DESTDIR)$(PREFIX)/include
46+
mkdir -p $(DESTDIR)$(includedir)
4747
cp -a libopenlibm.$(SHLIB_EXT)* libopenlibm.a $(DESTDIR)$(libdir)/
48-
cp -a src/openlibm.h $(DESTDIR)$(PREFIX)/include/
48+
cp -a src/openlibm.h $(DESTDIR)$(includedir)/

0 commit comments

Comments
 (0)