more correct library versioning

svn path=/trunk/; revision=2750

5 files changed, 13 insertions, 26 deletions

diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
index 5dd7d903..eab21cac 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
@@ -2,10 +2,8 @@
 
 ifdef SHARED
 LDFLAGS += -install_name $(FLEXTLIB)/$(TARGETNAME)
-# PKGVERSION must be in the 0.0.0 format
-LDFLAGS += -current_version $(PKGVERSION)
-# strip last number
-LDFLAGS += -compatibility_version $(basename $(PKGVERSION))
+LDFLAGS += -current_version $(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO)
+LDFLAGS += -compatibility_version $(FLEXTMAJOR).$(FLEXTMINOR)
 LDFLAGS += -preload -seg1addr 0xd0000000
 endif
 
@@ -70,11 +68,8 @@ $(FLEXTLIB):
 _install_: $(FLEXTINC) $(FLEXTLIB)
 ifdef FLEXTFRAMEWORK
 # --- install as framework ---
-ifndef PKGVERSION
-$(error Need package version)
-endif
-	mkdir -p $(FLEXTFRAMEWORK)/Versions/$(basename $(PKGVERSION))/Headers
-	ln -sfh ./$(basename $(PKGVERSION)) $(FLEXTFRAMEWORK)/Versions/Current
+	mkdir -p $(FLEXTFRAMEWORK)/Versions/$(FLEXTMAJOR).$(FLEXTMINOR)/Headers
+	ln -sfh ./$(FLEXTMAJOR).$(FLEXTMINOR) $(FLEXTFRAMEWORK)/Versions/Current
 	ln -sfh ./Versions/Current/Headers $(FLEXTFRAMEWORK)/Headers
 	install $(TARGET) $(FLEXTFRAMEWORK)/Versions/Current
 ifdef SHARED
@@ -93,7 +88,7 @@ ifndef SHARED
 	ranlib $(FLEXTLIB)/$(VERNAME)  
 endif
 ifdef VERNAME
-	ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
+	ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
 endif
 	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
 endif
diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
index 531d92b1..34c42aa6 100644
--- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
@@ -10,13 +10,7 @@ OBJPATH=$(OUTPATH)/$(OUTSUB)
 TARGETPATH=$(OBJPATH)
 
 TARGETNAME=$(OUTNAME).$(EXT)
-ifdef PKGVERSION
-VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
+VERNAME=$(OUTNAME).$(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO).$(EXT)
 TARGET=$(TARGETPATH)/$(VERNAME)
-else
-TARGET=$(TARGETPATH)/$(TARGETNAME)
-endif
 
 INSTTARGET=$(TARGET)
-
-
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
index 62486351..e7af8eb6 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
@@ -1,3 +1,6 @@
 EXT=pd_darwin
 
 LDFLAGS += -bundle -bundle_loader $(PDBIN) -flat_namespace
+
+TARGET=$(TARGETPATH)/$(TARGETNAME)
+INSTTARGET=$(TARGET)
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
index 17d6540d..782606fc 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
@@ -5,3 +5,7 @@ EXT=a
 endif
 
 LDFLAGS += -dynamiclib -flat_namespace -undefined suppress
+
+VERNAME=$(OUTNAME).$(FLEXTMAJOR).$(FLEXTMINOR).$(FLEXTMICRO).$(EXT)
+TARGET=$(TARGETPATH)/$(VERNAME)
+INSTTARGET=$(TARGET)
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
index 4f1648c5..dc688593 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
@@ -8,12 +8,3 @@ LIBPATH += -L$(PDPATH)/bin
 OBJPATH=$(OUTPATH)/$(OUTSUB)
 TARGETPATH=$(OBJPATH)
 TARGETNAME=$(OUTNAME).$(EXT)
-
-ifdef PKGVERSION
-VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
-TARGET=$(TARGETPATH)/$(VERNAME)
-else
-TARGET=$(TARGETPATH)/$(TARGETNAME)
-endif
-
-INSTTARGET=$(TARGET)