From 14b97f2c94bb045066449cbcca96663ff7e6e1a2 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 May 2020 21:43:42 +0200
Subject: [PATCH] build: Simplify Makefile.

Now that only elf is supported we may get rid of the "format" variable
and the conditional.
---
 Makefile | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index ba10fd5..ba61ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -50,40 +50,35 @@ LIBCFLAGS += -fvisibility=hidden
 libname := osl
 
 ifeq ($(uname_s),Linux)
-	format := elf
 	LDFLAGS += -Wl,-soname,$(soname)
 	# disallow undefined symbols
 	LDFLAGS += -Wl,-z,defs
 endif
 ifeq ($(uname_s),NetBSD)
-	format := elf
 	LDFLAGS += -Wl,-soname,$(soname)
 endif
 
 ifeq ($(uname_s),FreeBSD)
-	format := elf
 	LDFLAGS += -Wl,-soname,$(soname)
 endif
 
-ifeq ($(format),elf)
-	# On ELf-based systems, the following conventions apply (see dhweeler's
-	# Program Library HOWTO):
-	#
-	# The soname has the prefix ``lib'', the name of the library, the
-	# phrase ``.so'', followed by a period and a version number that is
-	# incremented whenever the interface changes.
-	soname := lib$(libname).so.$(x)
-
-	# The real name adds to the soname a period, a minor number, another
-	# period, and the release number.
-	realname := $(soname).$(y).$(z)
-
-	# In addition, there's the name that the compiler uses when requesting
-	# a library, (I'll call it the ``linker name''), which is simply the
-	# soname without any version number.
-	linkername := lib$(libname).so
-	LDFLAGS += --shared
-endif
+# On ELf-based systems, the following conventions apply (see dhweeler's
+# Program Library HOWTO):
+#
+# The soname has the prefix ``lib'', the name of the library, the
+# phrase ``.so'', followed by a period and a version number that is
+# incremented whenever the interface changes.
+soname := lib$(libname).so.$(x)
+
+# The real name adds to the soname a period, a minor number, another
+# period, and the release number.
+realname := $(soname).$(y).$(z)
+
+# In addition, there's the name that the compiler uses when requesting
+# a library, (I'll call it the ``linker name''), which is simply the
+# soname without any version number.
+linkername := lib$(libname).so
+LDFLAGS += --shared
 
 all: $(realname) $(executables) $(man_pages)
 shared: $(realname)
-- 
2.39.5