fixed library versioning

updates for build system
small fix
updates to build system
fix tutorial compilation
install build system and a convenient script
first steps to flext framework for OSX

svn path=/trunk/; revision=2707

8 files changed, 79 insertions, 61 deletions

diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
index b3a20f16..5a26af4c 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
@@ -1,9 +1,7 @@
 # build class specific settings
 
-TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
-
 INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
+LIBPATH += -L$(FLEXTLIB)
 LIBS += -l$(FLEXTNAME)
 
 ##############################################
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
index 3a84d399..2689e922 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
@@ -1,12 +1,5 @@
 # build class specific settings
 
-ifdef SHARED
-SONAME=$(OUTNAME).$(EXT)
-TARGET=$(TARGETPATH)/$(OUTNAME).$(PKGVERSION).$(EXT)
-else
-TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
-endif
-
 ##############################################
 
 # default target
@@ -28,7 +21,7 @@ $(TARGET) :: $(TARGETPATH)
 
 $(TARGET) :: $(COBJS) $(CPPOBJS)
 ifdef SHARED
-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(SONAME) $(COBJS) $(CPPOBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(TARGETNAME) $(COBJS) $(CPPOBJS) $(LIBS)
 	chmod 755 $@
 ifndef DEBUG
 ifndef PROFILE
@@ -46,21 +39,24 @@ _clean_:
 
 ##############################################
 
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
-	-mkdir -p $@
-
-$(FLEXTLIBINST):
+$(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
 	-mkdir -p $@
 
-_install_: $(FLEXTINC) $(FLEXTLIBINST)
-	install $(TARGET) $(FLEXTLIBINST)
+_install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
+	install $(TARGET) $(FLEXTLIB)
+ifdef VERNAME
 ifdef SHARED
-	/sbin/ldconfig -l $(TARGET)
+	/sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+else
+	-ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
+endif
 endif
 	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+# transfer build system
+	cp -rf buildsys $(FLEXTSYS)
+	install build.sh $(FLEXTSYS)
+	chmod -R a+rx $(FLEXTSYS)
+# make convenience script
+	echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh
+	chmod a+rx $(FLEXTBIN)/flext-build.sh
+	
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
index 08945e71..6ff417aa 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -1,7 +1,24 @@
 ##############################################
 
+FLEXTINC=$(FLEXTPREFIX)/include/flext
+FLEXTLIB=$(FLEXTPREFIX)/lib
+FLEXTSYS=$(FLEXTPREFIX)/lib/flext
+FLEXTBIN=$(FLEXTPREFIX)/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/lnx/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
index 58bb7c3d..d19d5966 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
@@ -1,9 +1,7 @@
 # build class specific settings
 
-TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
-
 INCPATH += -I$(FLEXTINC)
-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
+LIBPATH += -L$(FLEXTLIB)
 LIBS += -l$(FLEXTNAME)
 
 ##############################################
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
index 8c106e7c..1668f609 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
@@ -1,12 +1,5 @@
 # build class specific settings
 
-ifdef SHARED
-SONAME=$(OUTNAME).$(EXT)
-TARGET=$(TARGETPATH)/$(OUTNAME).$(PKGVERSION).$(EXT)
-else
-TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
-endif
-
 ##############################################
 
 # default target
@@ -46,21 +39,24 @@ _clean_:
 
 ##############################################
 
-ifdef SHARED
-FLEXTLIBINST=$(FLEXTSHLIB)
-else
-FLEXTLIBINST=$(FLEXTLIB)
-endif
-
-$(FLEXTINC):
-	-mkdir -p $@
-
-$(FLEXTLIBINST):
+$(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
 	-mkdir -p $@
 
-_install_: $(FLEXTINC) $(FLEXTLIBINST)
-	install $(TARGET) $(FLEXTLIBINST)
+_install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
+	install $(TARGET) $(FLEXTLIB)
+ifdef VERNAME
 ifdef SHARED
-	/sbin/ldconfig -l $(TARGET)
+	/sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+else
+	-ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
+endif
 endif
 	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
+# transfer build system
+	cp -rf buildsys $(FLEXTSYS)
+	install build.sh $(FLEXTSYS)
+	chmod -R a+rx $(FLEXTSYS)
+# make convenience script
+	echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh
+	chmod a+rx $(FLEXTBIN)/flext-build.sh
+	
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
index 96d3d642..d624dc79 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
@@ -1,7 +1,24 @@
 ##############################################
 
+FLEXTINC=$(FLEXTPREFIX)/include/flext
+FLEXTLIB=$(FLEXTPREFIX)/lib
+FLEXTSYS=$(FLEXTPREFIX)/lib/flext
+FLEXTBIN=$(FLEXTPREFIX)/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/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
index aaff3340..be09f6d8 100644
--- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
@@ -4,14 +4,12 @@ PDPATH=/usr/local/src/pd
 
 ###############################################################
 
-# where do/should the flext headers reside/be built?
-FLEXTINC=/usr/local/include/flext
+# prefix for flext installation
+# headers are in $(FLEXTPREFIX)/include/flext
+# libraries are in $(FLEXTPREFIX)/lib
+# build system is in $(FLEXTPREFIX)/lib/flext
 
-# where do/should the flext static libraries reside/be built?
-FLEXTLIB=/usr/local/lib
-
-# where do/should the flext shared libraries reside/be built?
-FLEXTSHLIB=$(FLEXTLIB)
+FLEXTPREFIX=/usr/local
 
 ###############################################################
 
diff --git a/externals/grill/flext/buildsys/lnx/pd/config-icc.def b/externals/grill/flext/buildsys/lnx/pd/config-icc.def
index b6d6169e..526eba11 100644
--- a/externals/grill/flext/buildsys/lnx/pd/config-icc.def
+++ b/externals/grill/flext/buildsys/lnx/pd/config-icc.def
@@ -4,14 +4,12 @@ PDPATH=/usr/local/src/pd
 
 ###############################################################
 
-# where do/should the flext headers reside/be built?
-FLEXTINC=/usr/local/include/flext
+# prefix for flext installation
+# headers are in $(FLEXTPREFIX)/include/flext
+# libraries are in $(FLEXTPREFIX)/lib
+# build system is in $(FLEXTPREFIX)/lib/flext
 
-# where do/should the flext static libraries reside/be built?
-FLEXTLIB=/usr/local/lib
-
-# where do/should the flext shared libraries reside/be built?
-FLEXTSHLIB=$(FLEXTLIB)
+FLEXTPREFIX=/usr/local
 
 ###############################################################