aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-02-19 23:02:45 +0100
committerMattias Andrée <maandree@kth.se>2022-02-19 23:02:45 +0100
commitbace259b6f8d16739d96a464435f7aab7951a23f (patch)
treecfa5ffb42028faa51259e1508b3156dc9ecd0943
parentAdd readme, let use know the demo makes an assumption about the encoding, and remove old testing code (diff)
downloadlibparsepcf-bace259b6f8d16739d96a464435f7aab7951a23f.tar.gz
libparsepcf-bace259b6f8d16739d96a464435f7aab7951a23f.tar.bz2
libparsepcf-bace259b6f8d16739d96a464435f7aab7951a23f.tar.xz
Improve makefile
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--Makefile1
-rw-r--r--config.mk4
-rw-r--r--mk/linux.mk2
-rw-r--r--mk/macos.mk4
-rw-r--r--mk/windows.mk4
5 files changed, 11 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0c406ea..11fa042 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ install: libparsepcf.a libparsepcf.$(LIBEXT)
mkdir -p -- "$(DESTDIR)$(PREFIX)/include"
cp -- libparsepcf.a "$(DESTDIR)$(PREFIX)/lib/"
cp -- libparsepcf.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libparsepcf.$(LIBMINOREXT)"
+ $(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libparsepcf.$(LIBMINOREXT)"
ln -sf -- libparsepcf.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libparsepcf.$(LIBMAJOREXT)"
ln -sf -- libparsepcf.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libparsepcf.$(LIBEXT)"
cp -- libparsepcf.h "$(DESTDIR)$(PREFIX)/include/"
diff --git a/config.mk b/config.mk
index 9b16e1d..ab163d4 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 -D_GNU_SOURCE
-CFLAGS = -std=c99 -Wall -g
+CFLAGS = -Wall -g
LDFLAGS =
diff --git a/mk/linux.mk b/mk/linux.mk
index d016d31..ad58f69 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -2,3 +2,5 @@ LIBEXT = so
LIBFLAGS = -shared -Wl,-soname,lib$(LIB_NAME).$(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..bd7e30b 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/libparsepcf.$(LIBMAJOREXT)"
diff --git a/mk/windows.mk b/mk/windows.mk
index e9602e1..ed5ec8d 100644
--- a/mk/windows.mk
+++ b/mk/windows.mk
@@ -1,4 +1,6 @@
LIBEXT = dll
-LIBFLAGS = -mdll
+LIBFLAGS = -shared
LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = :