From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 May 2020 19:56:46 +0000 (+0200)
Subject: build: Reorder make variables.
X-Git-Tag: v0.2.0~8^2~2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=aad03a8d23774d258ab90dadde119db15f26ec38;p=osl.git

build: Reorder make variables.

Move and assignment to LDFLAGS up to have the settings of all three
sets of flags at one location. Move libname down to where it is
needed.
---

diff --git a/Makefile b/Makefile
index 92e66c1..8e0f163 100644
--- a/Makefile
+++ b/Makefile
@@ -45,11 +45,9 @@ CFLAGS += -Wbad-function-cast
 CFLAGS += -fPIC
 CFLAGS += -fvisibility=hidden
 
-libname := osl
-
 LDFLAGS += -Wl,-soname,$(soname)
-# disallow undefined symbols
 LDFLAGS += -Wl,-z,defs
+LDFLAGS += --shared
 
 # On ELf-based systems, the following conventions apply (see dhweeler's
 # Program Library HOWTO):
@@ -57,6 +55,7 @@ LDFLAGS += -Wl,-z,defs
 # 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.
+libname := osl
 soname := lib$(libname).so.$(x)
 
 # The real name adds to the soname a period, a minor number, another
@@ -67,7 +66,6 @@ realname := $(soname).$(y).$(z)
 # 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)