From 9688282d013caad855efaffb2adc0686511a4ceb Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 19 Feb 2022 20:34:30 +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 | 16 ++++++++++------ config.mk | 4 ++-- linux.mk | 5 ----- macos.mk | 5 ----- mk/linux.mk | 7 +++++++ mk/macos.mk | 7 +++++++ mk/windows.mk | 7 +++++++ 7 files changed, 33 insertions(+), 18 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 40a5af6..397f50a 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,19 @@ -.NONPOSIX: +.POSIX: CONFIGFILE = config.mk +include $(CONFIGFILE) + +OS = linux +# Linux: linux +# Mac OS: macos +# Windows: windows +include mk/$(OS).mk -OSCONFIGFILE = linux.mk -# Change to macos.mk for Mac OS LIB_MAJOR = 1 LIB_MINOR = 0 LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR) -include $(CONFIGFILE) -include $(OSCONFIGFILE) HDR =\ libsha1.h\ @@ -34,7 +37,7 @@ OBJ =\ sum_fd.o\ unhex.o\ unmarshal.o\ - update.o\ + update.o MAN0 =\ libsha1.h.0 @@ -92,6 +95,7 @@ install: libsha1.a libsha1.$(LIBEXT) mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man3" cp -- libsha1.a "$(DESTDIR)$(PREFIX)/lib" cp -- libsha1.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMINOREXT)" + $(FIX_INSTALL_NAME) -- "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMINOREXT)" ln -sf -- "libsha1.$(LIBMINOREXT).$(LIB_MINOR)" "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMAJOREXT)" ln -sf -- "libsha1.$(LIBMAJOREXT)" "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBEXT)" cp -- libsha1.h "$(DESTDIR)$(PREFIX)/include" diff --git a/config.mk b/config.mk index a2d88f2..2062ea6 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 -O3 +CFLAGS = -Wall -O3 LDFLAGS = -s diff --git a/linux.mk b/linux.mk deleted file mode 100644 index 3a44969..0000000 --- a/linux.mk +++ /dev/null @@ -1,5 +0,0 @@ -LIBEXT = so -LIBFLAGS = -shared -Wl,-soname,libsha1.$(LIBEXT).$(LIB_MAJOR) - -LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) -LIBMINOREXT = $(LIBEXT).$(LIB_MAJOR).$(LIB_MINOR) diff --git a/macos.mk b/macos.mk deleted file mode 100644 index 47d4b44..0000000 --- a/macos.mk +++ /dev/null @@ -1,5 +0,0 @@ -LIBEXT = dylib -LIBFLAGS = -dynamiclib - -LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) -LIBMINOREXT = $(LIB_MAJOR).$(LIB_MINOR).$(LIBEXT) diff --git a/mk/linux.mk b/mk/linux.mk new file mode 100644 index 0000000..4129746 --- /dev/null +++ b/mk/linux.mk @@ -0,0 +1,7 @@ +LIBEXT = so +LIBFLAGS = -shared -Wl,-soname,libsha1.$(LIBEXT).$(LIB_MAJOR) + +LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) +LIBMINOREXT = $(LIBEXT).$(LIB_MAJOR).$(LIB_MINOR) + +FIX_INSTALL_NAME = : diff --git a/mk/macos.mk b/mk/macos.mk new file mode 100644 index 0000000..4d839b1 --- /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_MAJOR).$(LIB_MINOR).$(LIBEXT) + +FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libsha1.$(LIBMAJOREXT)" diff --git a/mk/windows.mk b/mk/windows.mk new file mode 100644 index 0000000..304b6be --- /dev/null +++ b/mk/windows.mk @@ -0,0 +1,7 @@ +LIBEXT = dll +LIBFLAGS = -shared + +LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) +LIBMINOREXT = $(LIB_MAJOR).$(LIB_MINOR).$(LIBEXT) + +FIX_INSTALL_NAME = : -- cgit v1.2.3-70-g09d2