diff --git a/config/Makefile.darwin b/config/Makefile.darwin index a9612f6..c3a505a 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -17,13 +17,13 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).$(SO_MAJOR).dylib -LIB.SONAME.MINOR = $(LIB.SONAME.MAJOR).$(SO_MINOR).dylib +LIB.SONAME.MINOR = lib$(NAME).$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.SONAME.MINOR.MX = $(LIB.SONAME.MAJOR.MX).$(SO_MINOR).dylib +LIB.SONAME.MINOR.MX = lib$(NAME)mx.$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK.MX = lib$(NAME)mx.dylib LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index e2e34d5..51c98b6 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -17,13 +17,13 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).$(SO_MAJOR).dylib -LIB.SONAME.MINOR = $(LIB.SONAME.MAJOR).$(SO_MINOR).dylib +LIB.SONAME.MINOR = lib$(NAME).$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.SONAME.MINOR.MX = $(LIB.SONAME.MAJOR.MX).$(SO_MINOR).dylib +LIB.SONAME.MINOR.MX = lib$(NAME)mx.$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK.MX = lib$(NAME)mx.dylib LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.darwin-universal b/config/Makefile.darwin-universal index b8f750a..aad080a 100644 --- a/config/Makefile.darwin-universal +++ b/config/Makefile.darwin-universal @@ -20,13 +20,13 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).$(SO_MAJOR).dylib -LIB.SONAME.MINOR = $(LIB.SONAME.MAJOR).$(SO_MINOR).dylib +LIB.SONAME.MINOR = lib$(NAME).$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.SONAME.MINOR.MX = $(LIB.SONAME.MAJOR.MX).$(SO_MINOR).dylib +LIB.SONAME.MINOR.MX = lib$(NAME)mx.$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK.MX = lib$(NAME)mx.dylib LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index eda70fe..7596f77 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -17,13 +17,13 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).$(SO_MAJOR).dylib -LIB.SONAME.MINOR = $(LIB.SONAME.MAJOR).$(SO_MINOR).dylib +LIB.SONAME.MINOR = lib$(NAME).$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK = lib$(NAME).dylib LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.$(SO_MAJOR).dylib -LIB.SONAME.MINOR.MX = $(LIB.SONAME.MAJOR.MX).$(SO_MINOR).dylib +LIB.SONAME.MINOR.MX = lib$(NAME)mx.$(SO_MAJOR).$(SO_MINOR).dylib LIB.DEVLNK.MX = lib$(NAME)mx.dylib LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index 5b7d18a..a0cf1f6 100644 --- a/config/Makefile.freebsd +++ b/config/Makefile.freebsd @@ -11,13 +11,13 @@ WARN = -Wall -W POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.gnu b/config/Makefile.gnu index ac9981f..9eb8cde 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -11,7 +11,7 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a diff --git a/config/Makefile.haiku b/config/Makefile.haiku index 7fb465f..ccef26a 100644 --- a/config/Makefile.haiku +++ b/config/Makefile.haiku @@ -16,7 +16,7 @@ POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a diff --git a/config/Makefile.irix b/config/Makefile.irix index 8002c85..8d5878f 100644 --- a/config/Makefile.irix +++ b/config/Makefile.irix @@ -11,7 +11,7 @@ WARN = -fullwarn -woff 1110,1498 POPT = -O2 -OPT:Olimit=0 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index f5f39c5..7480f8b 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -11,7 +11,7 @@ POPT = -O2 CFLAGS.EXTRA += -fPIC BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a diff --git a/config/Makefile.linux b/config/Makefile.linux index 590c01c..5b04d1f 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -26,13 +26,13 @@ CFLAGS.EXTRA += -fPIC CFLAGS.EXTRA += -Wcast-qual BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.nacl-32 b/config/Makefile.nacl-32 index a6ede48..8ac1af5 100644 --- a/config/Makefile.nacl-32 +++ b/config/Makefile.nacl-32 @@ -25,13 +25,13 @@ WARN = -Wall -W -Wno-unused-parameter POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.nacl-64 b/config/Makefile.nacl-64 index ff0d260..6e4dc37 100644 --- a/config/Makefile.nacl-64 +++ b/config/Makefile.nacl-64 @@ -25,13 +25,13 @@ WARN = -Wall -W -Wno-unused-parameter POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = $(LDFLAGS.DYNAMIC) -soname=$(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd index 64caaa4..3e5f14c 100644 --- a/config/Makefile.netbsd +++ b/config/Makefile.netbsd @@ -11,13 +11,13 @@ WARN = -Wall -W POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd index a2cc601..18c6fdd 100644 --- a/config/Makefile.openbsd +++ b/config/Makefile.openbsd @@ -11,13 +11,13 @@ WARN = -Wall -W POPT = -O2 BIN.SUFFIX = LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -soname $(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.solaris b/config/Makefile.solaris index 65fa34a..80433af 100644 --- a/config/Makefile.solaris +++ b/config/Makefile.solaris @@ -9,12 +9,12 @@ NAME = GLEW BIN.SUFFIX = POPT = -xO2 LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index 2c63839..421f03d 100644 --- a/config/Makefile.solaris-gcc +++ b/config/Makefile.solaris-gcc @@ -9,13 +9,13 @@ NAME = GLEW BIN.SUFFIX = POPT = -O2 LIB.SONAME.MAJOR = lib$(NAME).so.$(SO_MAJOR) -LIB.SONAME.MINOR = ${LIB.SONAME.MAJOR}.$(SO_MINOR) +LIB.SONAME.MINOR = lib$(NAME).so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK = lib$(NAME).so LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.STATIC = lib$(NAME).a LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME.MAJOR) LIB.SONAME.MAJOR.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.SONAME.MINOR.MX = ${LIB.SONAME.MAJOR.MX}.$(SO_MINOR) +LIB.SONAME.MINOR.MX = lib$(NAME)mx.so.$(SO_MAJOR).$(SO_MINOR) LIB.DEVLNK.MX = lib$(NAME)mx.so LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) LIB.STATIC.MX = lib$(NAME)mx.a