Simply use the major version of the lib also on MacOS.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index 38af988b70655f2c48c866c7d36d013b5fa436af..7204f88f535053b622048fbb1a0a2b0d80889674 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,9 @@ ifeq ($(uname_s),Linux)
        dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
 endif
 ifeq ($(uname_s),Darwin)
-       mac_major_version := $(shell expr 41 + $(major_version))
        dso_opts := -dynamiclib -current_version $(major_version).$(minor_version) \
                -compatibility_version $(major_version).$(minor_version) -fvisibility=hidden
-       dso_filename := lib$(libname).$(shell printf "\\x"$(mac_major_version).dylib)
+       dso_filename := lib$(libname).$(major_version)
 endif
 ifeq ($(uname_s),SunOS)
        dso_opts := --shared -z text -z defs
@@ -38,9 +37,9 @@ LDFLAGS += -Wl,-z,defs
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
-#CPPFLAGS += -Os
+CPPFLAGS += -Os
 CPPFLAGS += -Wall
-#CPPFLAGS += -Wuninitialized
+CPPFLAGS += -Wuninitialized
 CPPFLAGS += -Wchar-subscripts
 CPPFLAGS += -Wformat-security
 CPPFLAGS += -Werror-implicit-function-declaration