[PD-cvs] externals/grill/flext/buildsys/lnx gnumake-gcc-ext.inc, 1.6, 1.7 gnumake-gcc-flext.inc, 1.7, 1.8 gnumake-gcc.inc, 1.7, 1.8 gnumake-icc-ext.inc, 1.3, 1.4 gnumake-icc-flext.inc, 1.3, 1.4 gnumake-icc.inc, 1.3, 1.4 - Pd-cvs

13 Apr 2005


      Update of /cvsroot/pure-data/externals/grill/flext/buildsys/lnx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5213/buildsys/lnx
Modified Files:
    gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc 
    gnumake-icc-ext.inc gnumake-icc-flext.inc gnumake-icc.inc 
Log Message:
more correct library versioning
Index: gnumake-icc-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnumake-icc-flext.inc	10 Apr 2005 22:22:39 -0000	1.3
--- gnumake-icc-flext.inc	13 Apr 2005 00:24:18 -0000	1.4
***************
*** 1,4 ****
--- 1,13 ----
  # build class specific settings
+ CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR)
+ VERNAME=$(CMPNAME).$(FLEXTMICRO)
+ TARGET=$(TARGETPATH)/$(VERNAME)
+ INSTTARGET=$(TARGET)
+ 
+ ifdef SHARED
+ LDFLAGS += -Wl,-soname,$(CMPNAME) 
+ endif
+ 
  ##############################################
***************
*** 45,54 ****
  _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
    install $(TARGET) $(FLEXTLIB)
- ifdef VERNAME
  ifdef SHARED
    /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
  else
! 	-ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
! endif
  endif
    install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
--- 54,62 ----
  _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
    install $(TARGET) $(FLEXTLIB)
  ifdef SHARED
    /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+ 	-ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT)
  else
! 	-ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
  endif
    install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
Index: gnumake-gcc-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gnumake-gcc-ext.inc	10 Apr 2005 22:22:22 -0000	1.6
--- gnumake-gcc-ext.inc	13 Apr 2005 00:24:18 -0000	1.7
***************
*** 1,7 ****
--- 1,15 ----
  # 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
##############################################
Index: gnumake-gcc.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gnumake-gcc.inc	10 Apr 2005 22:22:39 -0000	1.7
--- gnumake-gcc.inc	13 Apr 2005 00:24:18 -0000	1.8
***************
*** 12,24 ****
  TARGETNAME=$(OUTNAME).$(EXT)
- ifdef PKGVERSION
- VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
- TARGET=$(TARGETPATH)/$(VERNAME)
- else
- TARGET=$(TARGETPATH)/$(TARGETNAME)
- endif
- 
- INSTTARGET=$(TARGET)
- 
  ##############################################
--- 12,15 ----
Index: gnumake-icc.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnumake-icc.inc	10 Apr 2005 22:22:39 -0000	1.3
--- gnumake-icc.inc	13 Apr 2005 00:24:18 -0000	1.4
***************
*** 12,24 ****
  TARGETNAME=$(OUTNAME).$(EXT)
- ifdef PKGVERSION
- VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
- TARGET=$(TARGETPATH)/$(VERNAME)
- else
- TARGET=$(TARGETPATH)/$(TARGETNAME)
- endif
- 
- INSTTARGET=$(TARGET)
- 
  ##############################################
--- 12,15 ----
Index: gnumake-icc-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gnumake-icc-ext.inc	10 Apr 2005 22:22:39 -0000	1.3
--- gnumake-icc-ext.inc	13 Apr 2005 00:24:18 -0000	1.4
***************
*** 1,7 ****
--- 1,15 ----
  # 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
##############################################
Index: gnumake-gcc-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gnumake-gcc-flext.inc	10 Apr 2005 22:22:39 -0000	1.7
--- gnumake-gcc-flext.inc	13 Apr 2005 00:24:18 -0000	1.8
***************
*** 1,4 ****
--- 1,13 ----
  # build class specific settings
+ CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR)
+ VERNAME=$(CMPNAME).$(FLEXTMICRO)
+ TARGET=$(TARGETPATH)/$(VERNAME)
+ INSTTARGET=$(TARGET)
+ 
+ ifdef SHARED
+ LDFLAGS += -Wl,-soname,$(CMPNAME) 
+ endif
+ 
  ##############################################
***************
*** 22,26 ****
  $(TARGET) :: $(COBJS) $(CPPOBJS)
  ifdef SHARED
! 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(TARGETNAME) $(COBJS) $(CPPOBJS) $(LIBS)
    chmod 755 $@
  ifndef DEBUG
--- 31,35 ----
  $(TARGET) :: $(COBJS) $(CPPOBJS)
  ifdef SHARED
! 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
    chmod 755 $@
  ifndef DEBUG
***************
*** 45,54 ****
  _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
    install $(TARGET) $(FLEXTLIB)
- ifdef VERNAME
  ifdef SHARED
    /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
  else
! 	-ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
! endif
  endif
    install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
--- 54,62 ----
  _install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
    install $(TARGET) $(FLEXTLIB)
  ifdef SHARED
    /sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+ 	-ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT)
  else
! 	-ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
  endif
    install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)