[PD-cvs] packages/darwin_app Makefile,1.11,1.12

[Thomas Grill]

Update of /cvsroot/pure-data/packages/darwin_app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675

Modified Files:
	Makefile 
Log Message:
updates for flext and flext-based externals

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	3 Jun 2005 20:28:25 -0000	1.11
--- Makefile	5 Jun 2005 10:34:10 -0000	1.12
***************
*** 4,8 ****
  PD_APP_NAME = Pd
  
! DESTDIR = installroot
  PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents
  INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources
--- 4,8 ----
  PD_APP_NAME = Pd
  
! DESTDIR = installroot 
  PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents
  INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources
***************
*** 54,58 ****
  CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD)
  
! FLEXT_VERSION = $(shell grep PROJECT_NUMBER ../../externals/grill/flext/flext.doxy | cut -d '"' -f2 | cut -d ' ' -f2)
  
  GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2)
--- 54,58 ----
  CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD)
  
! FLEXT_VERSION = $(shell grep FLEXTMAJOR ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2).$(shell grep FLEXTMINOR ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2).$(shell grep FLEXTMICRO ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2)
  
  GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2)
***************
*** 295,300 ****
  #----------------------------------------------------------------------------
  # FLEXT
! 	cd ../../externals/grill/flext && bash build.sh pd gcc build-release-shared
! 	install -p -m0444 ../../externals/grill/flext/pd-darwin/release-shared/libflext-pd.dylib $(EXTERNALS_DIR)
  	install -d $(HELP_DIR)/tutorials
  	cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext
--- 295,315 ----
  #----------------------------------------------------------------------------
  # FLEXT
! 	cd ../../externals/grill/flext && \
! 		( \
! 			( \
! 				cat buildsys/config-mac-pd-gcc.txt | \
! 					sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/"  > ____c && \
! 				cp ____c buildsys/config-mac-pd-gcc.txt && rm -f ____c \
! 			) || \
! 			( \
! 				sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" buildsys/mac/pd/config-gcc.def > buildsys/config-mac-pd-gcc.txt \
! 			) \
! 		) && \
! 		( \
! 			cp -f build/config-mac.def config.txt \
! 		) && \
! 		bash build.sh pd gcc build-release-shared
! 	install -p -m0444 ../../externals/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(EXTERNALS_DIR)
! 	ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(EXTERNALS_DIR)/libflext-pd.dylib
  	install -d $(HELP_DIR)/tutorials
  	cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext
***************
*** 307,311 ****
  #########
  # dyn~
! 	cd ../../externals/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared
  	install -p -m0444 ../../externals/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/dynext/pd/*.pd $(HELP_DIR)/5.reference
--- 322,326 ----
  #########
  # dyn~
! 	cd ../../externals/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source
  	install -p -m0444 ../../externals/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/dynext/pd/*.pd $(HELP_DIR)/5.reference
***************
*** 317,321 ****
  #########
  # pool
! 	cd ../../externals/grill/pool && bash ../flext/build.sh pd gcc build-release-shared
  	install -p -m0444 ../../externals/grill/pool/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference
--- 332,336 ----
  #########
  # pool
! 	cd ../../externals/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source
  	install -p -m0444 ../../externals/grill/pool/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference
***************
*** 327,332 ****
  #########
  # py/pyext
! #	cd ../../externals/grill/py && bash ../flext/build.sh pd gcc build-release-shared
! #	install -p -m0444 ../../externals/grill/py/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -d $(HELP_DIR)/py/examples
  	install -d $(HELP_DIR)/py/scripts
--- 342,351 ----
  #########
  # py/pyext
! 	cd ../../externals/grill/py && \
! 		( \
! 			cp -f build/config-mac.def config.txt \
! 		) && \
! 		bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source
! 	install -p -m0444 ../../externals/grill/py/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -d $(HELP_DIR)/py/examples
  	install -d $(HELP_DIR)/py/scripts
***************
*** 342,346 ****
  #  fails without the dir
  #	test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin 
! 	cd ../../externals/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared
  	install -p -m0444 ../../externals/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference
--- 361,365 ----
  #  fails without the dir
  #	test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin 
! 	cd ../../externals/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source
  	install -p -m0444 ../../externals/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference
***************
*** 355,359 ****
  #########
  # xsample
! 	cd ../../externals/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared
  	install -p -m0444 ../../externals/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference
--- 374,378 ----
  #########
  # xsample
! 	cd ../../externals/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source
  	install -p -m0444 ../../externals/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR)
  	install -p -m0644 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference