Fix target osl_errors.h on MacOS.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index 7204f88f535053b622048fbb1a0a2b0d80889674..b5d4b169a4833bb4ad3470d1319f0d2e4836a081 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,22 @@ libname := osl
 ifeq ($(uname_s),Linux)
        dso_opts := --shared -Wl,-soname,libosl.so.$(major_version)
        dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+       # disallow undefined symbols
+       LDFLAGS += -Wl,-z,defs
 endif
 ifeq ($(uname_s),Darwin)
-       dso_opts := -dynamiclib -current_version $(major_version).$(minor_version) \
-               -compatibility_version $(major_version).$(minor_version) -fvisibility=hidden
-       dso_filename := lib$(libname).$(major_version)
+       # Darwin has its own idea on version numbers:
+       #
+       # The minor version number is an incremental number using the format
+       # X[.Y[.Z]]. To set the minor version number of a dynamic library, use
+       # the gcc -current_version option.
+       #
+       # The compatibility version number of a library release specifies the
+       # earliest minor version of the clients linked against that release can
+       # use.
+       dso_opts := -dynamiclib -current_version $(minor_version).$(patchlevel_version) \
+               -compatibility_version $(minor_version).0 -fvisibility=hidden
+       dso_filename := lib$(libname).$(major_version).dylib
 endif
 ifeq ($(uname_s),SunOS)
        dso_opts := --shared -z text -z defs
@@ -32,9 +43,6 @@ ifeq ($(uname_s),NetBSD)
 endif
 all: $(dso_filename)
 
-# disallow undefined symbols
-LDFLAGS += -Wl,-z,defs
-
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 CPPFLAGS += -Os
@@ -61,9 +69,9 @@ $(dso_filename): $(objects)
 
 osl_errors.h: errlist
        sed -e 's/\([A-Z_]*\)   .*/     E_OSL_\1/' \
-               -e '1s/^/enum osl_errors {\n/1' \
+               -e '1s/^/enum osl_errors {/1' \
                -e '$$!s/$$/,/g' \
-               -e '$$s/$$/\n};/1' $< > $@
+               -e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
        sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@