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 92e66c1e4e10889a68e5ebf517f3b7aa22cedce1..8e0f163b671aaba4554cfe76a00febaa99c24fa1 100644 (file)
--- 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)