[PD-cvs] externals Makefile,1.143,1.144

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29721

Modified Files:
	Makefile 
Log Message:
made gem2pdp build more robust

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** Makefile	27 Apr 2007 03:47:09 -0000	1.143
--- Makefile	27 Apr 2007 13:46:56 -0000	1.144
***************
*** 799,803 ****
  # GEM2PDP
  GEM2PDP_NAME=gem2pdp
! GEM2PDP_OBJECTS := $(wildcard $(externals_src)/gem2pdp/*.c)
  $(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
  	cd $(externals_src)/gem2pdp && autoconf
--- 799,803 ----
  # GEM2PDP
  GEM2PDP_NAME=gem2pdp
! GEM2PDP_OBJECTS := $(wildcard $(externals_src)/gem2pdp/*.cpp)
  $(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
  	cd $(externals_src)/gem2pdp && autoconf
***************
*** 807,817 ****
  		--with-gemdir=$(gem_src)  --with-pdpdir=$(externals_src)/pdp
  
! $(externals_src)/gem2pdp/gem2pdp.$(EXTENSION): \
! $(externals_src)/gem2pdp/configure $(externals_src)/gem2pdp/Makefile 
  	$(MAKE) -C $(externals_src)/gem2pdp
  
- gem2pdp: $(externals_src)/gem2pdp/gem2pdp.$(EXTENSION)
- 
  gem2pdp_install: gem2pdp
  #	install -d $(objectsdir)/$(GEM2PDP_NAME)
  #	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(GEM2PDP_NAME) \
--- 807,815 ----
  		--with-gemdir=$(gem_src)  --with-pdpdir=$(externals_src)/pdp
  
! gem2pdp: $(externals_src)/gem2pdp/configure $(externals_src)/gem2pdp/Makefile
  	$(MAKE) -C $(externals_src)/gem2pdp
  
  gem2pdp_install: gem2pdp
+ 	install -d $(objectsdir)
  #	install -d $(objectsdir)/$(GEM2PDP_NAME)
  #	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(GEM2PDP_NAME) \
***************
*** 819,824 ****
  #		--description "Bridges between Gem and PDP" \
  #		--version "0.6"
! 	install -p $(wildcard $(externals_src)/gem2pdp/*.$(EXTENSION)) $(objectsdir)
  #	install -d $(helpdir)/$(GEM2PDP_NAME)
  	install -p $(externals_src)/gem2pdp/*.pd  $(helpdir)
  #	install -d $(manualsdir)/$(GEM2PDP_NAME)
--- 817,823 ----
  #		--description "Bridges between Gem and PDP" \
  #		--version "0.6"
! 	install -p $(GEM2PDP_OBJECTS:.cpp=.$(EXTENSION)) $(objectsdir)
  #	install -d $(helpdir)/$(GEM2PDP_NAME)
+ 	install -d $(helpdir)
  	install -p $(externals_src)/gem2pdp/*.pd  $(helpdir)
  #	install -d $(manualsdir)/$(GEM2PDP_NAME)
***************
*** 838,842 ****
  	-rm -f -- $(externals_src)/gem2pdp/configure
  	-rm -f -- $(externals_src)/gem2pdp/Makefile
! 	-rm -f -- $(externals_src)/gem2pdp/*.$(EXTENSION)
  	-rm -f -- $(externals_src)/gem2pdp/*.o
  	-rm -f -- $(externals_src)/gem2pdp/*.bak
--- 837,841 ----
  	-rm -f -- $(externals_src)/gem2pdp/configure
  	-rm -f -- $(externals_src)/gem2pdp/Makefile
! 	-rm -f -- $(GEM2PDP_OBJECTS:.cpp=.$(EXTENSION))
  	-rm -f -- $(externals_src)/gem2pdp/*.o
  	-rm -f -- $(externals_src)/gem2pdp/*.bak