externals Makefile,1.91,1.92 - Pd-cvs

28 Sep 2006


      Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27365
Modified Files:
    Makefile 
Log Message:
fixed up zexy targets to only run autoconf or ./configure when needed; added --with-pd flag, but it doesn't seem to work; added autoconf stuff to the clean target
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** Makefile	25 Sep 2006 12:00:42 -0000	1.91
--- Makefile	28 Sep 2006 02:55:50 -0000	1.92
***************
*** 10,14 ****
# these are setup to be overridden by the packages/Makefile
! cvs_root_dir = $(CWD)/..
  DESTDIR = $(CWD)/build/
  BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
--- 10,14 ----
# these are setup to be overridden by the packages/Makefile
! cvs_root_dir = $(shell cd $(CWD)/.. && pwd)
  DESTDIR = $(CWD)/build/
  BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
***************
*** 1991,2003 ****
  # Zexy
  ZEXY_NAME = zexy
! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-y0]*.c $(externals_src)/zexy/src/z~.c)
  ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \
    grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
! zexy_configure:
! 	make -C $(externals_src)/zexy/src/ configure
! 	cd $(externals_src)/zexy/src/ && ./configure --disable-library
! zexy: zexy_configure
    make -C $(externals_src)/zexy/src/
--- 1991,2011 ----
  # Zexy
  ZEXY_NAME = zexy
! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-y0]*.c \
! $(externals_src)/zexy/src/z~.c)
  ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \
    grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2)
! $(externals_src)/zexy/src/configure: $(externals_src)/zexy/src/configure.ac
! 	cd $(externals_src)/zexy/src && autoconf
! $(externals_src)/zexy/src/zexyconf.h:
! 	cd $(externals_src)/zexy/src && autoconf
! 
! $(externals_src)/zexy/src/Make.config: $(externals_src)/zexy/src/Make.config.in \
! $(externals_src)/zexy/src/configure $(externals_src)/zexy/src/zexyconf.h
! 	cd $(externals_src)/zexy/src/ && ./configure --disable-library \
! 		--with-pd=$(pd_src)
! 
! zexy: $(externals_src)/zexy/src/Make.config
    make -C $(externals_src)/zexy/src/
***************
*** 2010,2014 ****
    	--version "$(ZEXY_VERSION)"
  #	install -p $(ZEXY_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME)
! 	install -p $(wildcard $(externals_src)/zexy/src/*.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME)
    install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \
    	grep -v '-help.pd' | sed 's|(.*)|"\1"|g') \
--- 2018,2023 ----
    	--version "$(ZEXY_VERSION)"
  #	install -p $(ZEXY_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME)
! 	install -p $(wildcard $(externals_src)/zexy/src/*.$(EXTENSION)) \
! 		$(objectsdir)/$(ZEXY_NAME)
    install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \
    	grep -v '-help.pd' | sed 's|(.*)|"\1"|g') \
***************
*** 2024,2027 ****
--- 2033,2041 ----
  zexy_clean:
    -rm -f -- $(ZEXY_OBJECTS:.c=.$(EXTENSION))
+ 	-rm -rf -- $(externals_src)/zexy/src/autom4ate
+ 	-rm -rf -- $(externals_src)/zexy/src/conf[0-9][0-9][0-9]*
+ 	-rm -f -- $(externals_src)/zexy/src/configure
+ 	-rm -f -- $(externals_src)/zexy/src/Make.config
+ 	-rm -f -- $(externals_src)/zexy/src/zexyconf.h
    -rm -f -- $(externals_src)/zexy/src/*.o
    -rm -f -- $(externals_src)/zexy/src/*.bak