From 4088fb791ebb50ffead13cbe80d6dd0fc480fc0c Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 13 Apr 2005 00:24:18 +0000 Subject: more correct library versioning svn path=/trunk/; revision=2750 --- externals/grill/flext/buildsys/bmake-sub.mak | 3 +++ externals/grill/flext/buildsys/gnumake-sub.mak | 3 +++ externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc | 8 ++++++++ externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc | 16 ++++++++++++---- externals/grill/flext/buildsys/lnx/gnumake-gcc.inc | 9 --------- externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc | 8 ++++++++ externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc | 14 +++++++++++--- externals/grill/flext/buildsys/lnx/gnumake-icc.inc | 9 --------- externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc | 15 +++++---------- .../grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc | 8 +------- .../grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc | 3 +++ .../grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc | 4 ++++ externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc | 9 --------- externals/grill/flext/buildsys/nmake-sub.mak | 3 +++ externals/grill/flext/buildsys/version.inc | 3 +++ externals/grill/flext/package.txt | 2 -- 16 files changed, 64 insertions(+), 53 deletions(-) create mode 100644 externals/grill/flext/buildsys/version.inc (limited to 'externals') diff --git a/externals/grill/flext/buildsys/bmake-sub.mak b/externals/grill/flext/buildsys/bmake-sub.mak index a4e38abe..f55fcc4f 100644 --- a/externals/grill/flext/buildsys/bmake-sub.mak +++ b/externals/grill/flext/buildsys/bmake-sub.mak @@ -1,3 +1,6 @@ +# include flext version number +!include $(BUILDPATH)version.inc + # general settings !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt diff --git a/externals/grill/flext/buildsys/gnumake-sub.mak b/externals/grill/flext/buildsys/gnumake-sub.mak index f0b35db1..17aa589f 100644 --- a/externals/grill/flext/buildsys/gnumake-sub.mak +++ b/externals/grill/flext/buildsys/gnumake-sub.mak @@ -1,3 +1,6 @@ +# include flext version number +include $(BUILDPATH)version.inc + # system settings include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc index 5a26af4c..09d77eb7 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc @@ -1,8 +1,16 @@ # build class specific settings +TARGET=$(TARGETPATH)/$(TARGETNAME) +INSTTARGET=$(TARGET) + INCPATH += -I$(FLEXTINC) LIBPATH += -L$(FLEXTLIB) + +#ifdef SHARED +#LIBS += -l$(FLEXTNAME).$(FLEXTMAJOR).$(FLEXTMINOR) +#else LIBS += -l$(FLEXTNAME) +#endif ############################################## diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc index 2689e922..33af6a1c 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc @@ -1,5 +1,14 @@ # build class specific settings +CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR) +VERNAME=$(CMPNAME).$(FLEXTMICRO) +TARGET=$(TARGETPATH)/$(VERNAME) +INSTTARGET=$(TARGET) + +ifdef SHARED +LDFLAGS += -Wl,-soname,$(CMPNAME) +endif + ############################################## # default target @@ -21,7 +30,7 @@ $(TARGET) :: $(TARGETPATH) $(TARGET) :: $(COBJS) $(CPPOBJS) ifdef SHARED - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(TARGETNAME) $(COBJS) $(CPPOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ ifndef DEBUG ifndef PROFILE @@ -44,12 +53,11 @@ $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN): _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN) install $(TARGET) $(FLEXTLIB) -ifdef VERNAME ifdef SHARED /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME) + -ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT) else - -ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME) -endif + -ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME) endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc index 6ff417aa..92b71ccf 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc @@ -11,15 +11,6 @@ OBJPATH=$(OUTPATH)/$(OUTSUB) TARGETPATH=$(OBJPATH) TARGETNAME=$(OUTNAME).$(EXT) -ifdef PKGVERSION -VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT) -TARGET=$(TARGETPATH)/$(VERNAME) -else -TARGET=$(TARGETPATH)/$(TARGETNAME) -endif - -INSTTARGET=$(TARGET) - ############################################## CFLAGS += -pthread -fPIC diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc index d19d5966..e60789ec 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc @@ -1,8 +1,16 @@ # build class specific settings +TARGET=$(TARGETPATH)/$(TARGETNAME) +INSTTARGET=$(TARGET) + INCPATH += -I$(FLEXTINC) LIBPATH += -L$(FLEXTLIB) + +ifdef SHARED +LIBS += -l$(FLEXTNAME).$(FLEXTMAJOR).$(FLEXTMINOR) +else LIBS += -l$(FLEXTNAME) +endif ############################################## diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc index 1668f609..03d0191e 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc @@ -1,5 +1,14 @@ # build class specific settings +CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR) +VERNAME=$(CMPNAME).$(FLEXTMICRO) +TARGET=$(TARGETPATH)/$(VERNAME) +INSTTARGET=$(TARGET) + +ifdef SHARED +LDFLAGS += -Wl,-soname,$(CMPNAME) +endif + ############################################## # default target @@ -44,12 +53,11 @@ $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN): _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN) install $(TARGET) $(FLEXTLIB) -ifdef VERNAME ifdef SHARED /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME) + -ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT) else - -ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME) -endif + -ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME) endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc index d624dc79..be58fc13 100644 --- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc +++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc @@ -11,15 +11,6 @@ OBJPATH=$(OUTPATH)/$(OUTSUB) TARGETPATH=$(OBJPATH) TARGETNAME=$(OUTNAME).$(EXT) -ifdef PKGVERSION -VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT) -TARGET=$(TARGETPATH)/$(VERNAME) -else -TARGET=$(TARGETPATH)/$(TARGETNAME) -endif - -INSTTARGET=$(TARGET) - ############################################## CFLAGS += 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) diff --git a/externals/grill/flext/buildsys/nmake-sub.mak b/externals/grill/flext/buildsys/nmake-sub.mak index faa3c738..c8b78044 100644 --- a/externals/grill/flext/buildsys/nmake-sub.mak +++ b/externals/grill/flext/buildsys/nmake-sub.mak @@ -1,3 +1,6 @@ +# include flext version number +!include $(BUILDPATH)version.inc + # general settings !include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt diff --git a/externals/grill/flext/buildsys/version.inc b/externals/grill/flext/buildsys/version.inc new file mode 100644 index 00000000..90913585 --- /dev/null +++ b/externals/grill/flext/buildsys/version.inc @@ -0,0 +1,3 @@ +FLEXTMAJOR=0 +FLEXTMINOR=5 +FLEXTMICRO=0 diff --git a/externals/grill/flext/package.txt b/externals/grill/flext/package.txt index f93be714..e3033816 100644 --- a/externals/grill/flext/package.txt +++ b/externals/grill/flext/package.txt @@ -16,8 +16,6 @@ NAME=flext -PKGVERSION=0.5.0 - BUILDCLASS=flext BUILDMODE=all BUILDTYPE=all -- cgit v1.2.1