From 9ffba2d1b2f5efa605834b095a323293baf3fe4d Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Sat, 19 Feb 2022 23:10:24 +0100
Subject: Improve makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 Makefile      | 10 +++++-----
 config.mk     |  4 ++--
 mk/linux.mk   |  2 ++
 mk/macos.mk   |  4 +++-
 mk/windows.mk |  2 ++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ff565a7..7d039fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,5 @@
 .POSIX:
 
-LIB_MAJOR = 1
-LIB_MINOR = 0
-LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR)
-
-
 CONFIGFILE = config.mk
 include $(CONFIGFILE)
 
@@ -15,6 +10,10 @@ OS = linux
 include mk/$(OS).mk
 
 
+LIB_MAJOR = 1
+LIB_MINOR = 0
+LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR)
+
 
 OBJ =\
 	libcontacts_address_destroy.o\
@@ -84,6 +83,7 @@ install: libcontacts.a libcontacts.$(LIBEXT)
 	cp -- libcontacts.a "$(DESTDIR)$(PREFIX)/lib/"
 	cp -- libcontacts.h "$(DESTDIR)$(PREFIX)/include/"
 	cp -- libcontacts.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libcontacts.$(LIBMINOREXT)"
+	$(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libcontacts.$(LIBMINOREXT)"
 	ln -sf -- libcontacts.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libcontacts.$(LIBMAJOREXT)"
 	ln -sf -- libcontacts.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libcontacts.$(LIBEXT)"
 	cp -- $(MAN0) "$(DESTDIR)$(MANPREFIX)/man0/"
diff --git a/config.mk b/config.mk
index f785a40..aac9464 100644
--- a/config.mk
+++ b/config.mk
@@ -1,8 +1,8 @@
 PREFIX    = /usr
 MANPREFIX = $(PREFIX)/share/man
 
-CC = cc
+CC = c99
 
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700
-CFLAGS   = -std=c99 -Wall -Os
+CFLAGS   = -Wall -Os
 LDFLAGS  = -s
diff --git a/mk/linux.mk b/mk/linux.mk
index e248fc9..bd8f92a 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -2,3 +2,5 @@ LIBEXT      = so
 LIBFLAGS    = -shared -Wl,-soname,libcontacts.$(LIBEXT).$(LIB_MAJOR)
 LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR)
 LIBMINOREXT = $(LIBEXT).$(LIB_VERSION)
+
+FIX_INSTALL_NAME = :
diff --git a/mk/macos.mk b/mk/macos.mk
index bd92de6..942d85b 100644
--- a/mk/macos.mk
+++ b/mk/macos.mk
@@ -1,4 +1,6 @@
 LIBEXT      = dylib
-LIBFLAGS    = -dynamiclib
+LIBFLAGS    = -dynamiclib -Wl,-compatibility_version,$(LIB_MAJOR) -Wl,-current_version,$(LIB_VERSION)
 LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
 LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libcontacts.$(LIBMAJOREXT)"
diff --git a/mk/windows.mk b/mk/windows.mk
index e9602e1..5b6f80d 100644
--- a/mk/windows.mk
+++ b/mk/windows.mk
@@ -2,3 +2,5 @@ LIBEXT      = dll
 LIBFLAGS    = -mdll
 LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
 LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = :
-- 
cgit v1.2.3-70-g09d2