From 20c0ffb7b669c6fd95b191edf35fd26454053688 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 19 Feb 2022 23:07: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 --- Makefile | 11 +++++++---- config.mk | 4 ++-- linux.mk | 5 ----- macos.mk | 5 ----- mk/linux.mk | 7 +++++++ mk/macos.mk | 7 +++++++ mk/windows.mk | 7 +++++++ 7 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 linux.mk delete mode 100644 macos.mk create mode 100644 mk/linux.mk create mode 100644 mk/macos.mk create mode 100644 mk/windows.mk diff --git a/Makefile b/Makefile index 3ee1e78..5886962 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,18 @@ CONFIGFILE = config.mk include $(CONFIGFILE) -# Change to macos.mk for Mac OS -OSCONFIGFILE = linux.mk -include $(OSCONFIGFILE) +OS = linux +# Linux: linux +# Mac OS: macos +# Windows: windows +include mk/$(OS).mk LIB_MAJOR = 2 LIB_MINOR = 0 - LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR) + MAN3 = libhaiku.7 MAN7 = libhaiku_generic.3 libhaiku_perror.3 libhaiku_perror2.3 libhaiku_strerror.3 @@ -47,6 +49,7 @@ install: libhaiku.$(LIBEXT) libhaiku.a mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man7" cp -- libhaiku.a "$(DESTDIR)$(PREFIX)/lib/" cp -- libhaiku.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libhaiku.$(LIBMINOREXT)" + $(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libhaiku.$(LIBMINOREXT)" ln -sf -- libhaiku.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libhaiku.$(LIBMAJOREXT)" ln -sf -- libhaiku.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libhaiku.$(LIBEXT)" cp -- libhaiku.h "$(DESTDIR)$(PREFIX)/include/" diff --git a/config.mk b/config.mk index f087ea4..2a92212 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 -O2 +CFLAGS = -Wall -O2 LDFLAGS = -s diff --git a/linux.mk b/linux.mk deleted file mode 100644 index 55bb536..0000000 --- a/linux.mk +++ /dev/null @@ -1,5 +0,0 @@ -LIBEXT = so -LIBFLAGS = -shared -Wl,-soname,libhaiku.$(LIBEXT).$(LIB_MAJOR) - -LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) -LIBMINOREXT = $(LIBEXT).$(LIB_VERSION) diff --git a/macos.mk b/macos.mk deleted file mode 100644 index d5aec83..0000000 --- a/macos.mk +++ /dev/null @@ -1,5 +0,0 @@ -LIBEXT = dylib -LIBFLAGS = -dynamiclib - -LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) -LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) diff --git a/mk/linux.mk b/mk/linux.mk new file mode 100644 index 0000000..6f31f81 --- /dev/null +++ b/mk/linux.mk @@ -0,0 +1,7 @@ +LIBEXT = so +LIBFLAGS = -shared -Wl,-soname,libhaiku.$(LIBEXT).$(LIB_MAJOR) + +LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) +LIBMINOREXT = $(LIBEXT).$(LIB_VERSION) + +FIX_INSTALL_NAME = : diff --git a/mk/macos.mk b/mk/macos.mk new file mode 100644 index 0000000..7ae458d --- /dev/null +++ b/mk/macos.mk @@ -0,0 +1,7 @@ +LIBEXT = dylib +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/libhaiku.$(LIBMAJOREXT)" diff --git a/mk/windows.mk b/mk/windows.mk new file mode 100644 index 0000000..85f2d7f --- /dev/null +++ b/mk/windows.mk @@ -0,0 +1,7 @@ +LIBEXT = dll +LIBFLAGS = -shared + +LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) +LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) + +FIX_INSTALL_NAME = : -- cgit v1.2.3-70-g09d2