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

Thomas Grill xovo at users.sourceforge.net
Mon Apr 11 00:22:41 CEST 2005


Update of /cvsroot/pure-data/externals/grill/flext/buildsys/lnx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28918/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:
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


Index: gnumake-icc-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake-icc-flext.inc	12 Mar 2005 04:56:33 -0000	1.2
--- gnumake-icc-flext.inc	10 Apr 2005 22:22:39 -0000	1.3
***************
*** 1,11 ****
  # build class specific settings
  
- ifdef SHARED
- SONAME=$(OUTNAME).$(EXT)
- TARGET=$(TARGETPATH)/$(OUTNAME).$(PKGVERSION).$(EXT)
- else
- TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
- endif
- 
  ##############################################
  
--- 1,4 ----
***************
*** 47,66 ****
  ##############################################
  
! ifdef SHARED
! FLEXTLIBINST=$(FLEXTSHLIB)
! else
! FLEXTLIBINST=$(FLEXTLIB)
! endif
! 
! $(FLEXTINC):
! 	-mkdir -p $@
! 
! $(FLEXTLIBINST):
  	-mkdir -p $@
  
! _install_: $(FLEXTINC) $(FLEXTLIBINST)
! 	install $(TARGET) $(FLEXTLIBINST)
  ifdef SHARED
! 	/sbin/ldconfig -l $(TARGET)
  endif
  	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
--- 40,62 ----
  ##############################################
  
! $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
  	-mkdir -p $@
  
! _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)
+ # 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
+ 	

Index: gnumake-gcc-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gnumake-gcc-ext.inc	4 Mar 2005 04:56:17 -0000	1.5
--- gnumake-gcc-ext.inc	10 Apr 2005 22:22:22 -0000	1.6
***************
*** 1,8 ****
  # build class specific settings
  
- TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
- 
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
  LIBS += -l$(FLEXTNAME)
  
--- 1,6 ----
  # build class specific settings
  
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB)
  LIBS += -l$(FLEXTNAME)
  

Index: gnumake-gcc.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gnumake-gcc.inc	4 Mar 2005 04:56:26 -0000	1.6
--- gnumake-gcc.inc	10 Apr 2005 22:22:39 -0000	1.7
***************
*** 1,6 ****
--- 1,23 ----
  ##############################################
  
+ 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)
  
  ##############################################

Index: gnumake-icc.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake-icc.inc	12 Mar 2005 04:56:33 -0000	1.2
--- gnumake-icc.inc	10 Apr 2005 22:22:39 -0000	1.3
***************
*** 1,6 ****
--- 1,23 ----
  ##############################################
  
+ 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)
  
  ##############################################

Index: gnumake-icc-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake-icc-ext.inc	12 Mar 2005 04:56:33 -0000	1.2
--- gnumake-icc-ext.inc	10 Apr 2005 22:22:39 -0000	1.3
***************
*** 1,8 ****
  # build class specific settings
  
- TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
- 
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
  LIBS += -l$(FLEXTNAME)
  
--- 1,6 ----
  # build class specific settings
  
  INCPATH += -I$(FLEXTINC)
! LIBPATH += -L$(FLEXTLIB)
  LIBS += -l$(FLEXTNAME)
  

Index: gnumake-gcc-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gnumake-gcc-flext.inc	12 Mar 2005 04:56:32 -0000	1.6
--- gnumake-gcc-flext.inc	10 Apr 2005 22:22:39 -0000	1.7
***************
*** 1,11 ****
  # build class specific settings
  
- ifdef SHARED
- SONAME=$(OUTNAME).$(EXT)
- TARGET=$(TARGETPATH)/$(OUTNAME).$(PKGVERSION).$(EXT)
- else
- TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
- endif
- 
  ##############################################
  
--- 1,4 ----
***************
*** 29,33 ****
  $(TARGET) :: $(COBJS) $(CPPOBJS)
  ifdef SHARED
! 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(SONAME) $(COBJS) $(CPPOBJS) $(LIBS)
  	chmod 755 $@
  ifndef DEBUG
--- 22,26 ----
  $(TARGET) :: $(COBJS) $(CPPOBJS)
  ifdef SHARED
! 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(TARGETNAME) $(COBJS) $(CPPOBJS) $(LIBS)
  	chmod 755 $@
  ifndef DEBUG
***************
*** 47,66 ****
  ##############################################
  
! ifdef SHARED
! FLEXTLIBINST=$(FLEXTSHLIB)
! else
! FLEXTLIBINST=$(FLEXTLIB)
! endif
! 
! $(FLEXTINC):
! 	-mkdir -p $@
! 
! $(FLEXTLIBINST):
  	-mkdir -p $@
  
! _install_: $(FLEXTINC) $(FLEXTLIBINST)
! 	install $(TARGET) $(FLEXTLIBINST)
  ifdef SHARED
! 	/sbin/ldconfig -l $(TARGET)
  endif
  	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
--- 40,62 ----
  ##############################################
  
! $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
  	-mkdir -p $@
  
! _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)
+ # 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
+ 	





More information about the Pd-cvs mailing list