externals Makefile,1.147,1.148 - Pd-cvs

11 Jun 2007


      Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19556
Modified Files:
    Makefile 
Log Message:
call iem16's aclocal before trying to run configure:
    either one has to use the entire iem16-buildsystem or nothing at all...
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** Makefile	4 Jun 2007 10:51:32 -0000	1.147
--- Makefile	11 Jun 2007 08:13:12 -0000	1.148
***************
*** 1216,1232 ****
  IEM16_NAME=iem16
  IEM16_DIR := $(externals_src)/iem16/src
! IEM16_SRC := $(wildcard $(externals_src)/iem16/src/*.c)
! $(externals_src)/iem16/src/configure: $(externals_src)/iem16/src/configure.ac
! 	cd $(externals_src)/iem16/src && autoconf
! $(externals_src)/iem16/src/Make.config: $(externals_src)/iem16/src/Make.config.in \
! $(externals_src)/iem16/src/configure
! 	cd $(externals_src)/iem16/src/ && ./configure --disable-library \
    	--with-pd=$(pd_src)
! iem16: $(externals_src)/iem16/src/Make.config
! 	$(MAKE) -C $(externals_src)/iem16/src/
--- 1216,1234 ----
  IEM16_NAME=iem16
  IEM16_DIR := $(externals_src)/iem16/src
! IEM16_SRC := $(wildcard $(IEM16_DIR)/*.c)
+ $(IEM16_DIR)/aclocal.m4: $(IEM16_DIR)/acinclude.m4
+ 	cd $(IEM16_DIR) && aclocal
! $(IEM16_DIR)/configure: $(IEM16_DIR)/configure.ac $(IEM16_DIR)/aclocal.m4
! 	cd $(IEM16_DIR) && autoconf
! $(IEM16_DIR)/Make.config: $(IEM16_DIR)/Make.config.in \
! $(IEM16_DIR)/configure
! 	cd $(IEM16_DIR) && ./configure --disable-library \
    	--with-pd=$(pd_src)
! iem16: $(IEM16_DIR)/Make.config
! 	$(MAKE) -C $(IEM16_DIR)
***************
*** 1238,1242 ****
    	--license "GNU GPL" \
    	--version "0.1"
! 	install -p $(externals_src)/iem16/src/*.$(EXTENSION) $(objectsdir)/$(IEM16_NAME)
    install -d $(helpdir)/$(IEM16_NAME)
    install -p $(externals_src)/iem16/help/*.pd \
--- 1240,1244 ----
    	--license "GNU GPL" \
    	--version "0.1"
! 	install -p $(IEM16_DIR)/*.$(EXTENSION) $(objectsdir)/$(IEM16_NAME)
    install -d $(helpdir)/$(IEM16_NAME)
    install -p $(externals_src)/iem16/help/*.pd \
***************
*** 1244,1257 ****
iem16_clean:
! 	-$(MAKE) -C $(externals_src)/iem16/src clean
! 	-rm -f -- $(externals_src)/iem16/src/*.$(EXTENSION)
! 	-rm -f -- $(externals_src)/iem16/src/*.d
! 	-rm -rf -- $(externals_src)/iem16/src/autom4ate
! 	-rm -rf -- $(externals_src)/iem16/src/conf[0-9][0-9][0-9]*
! 	-rm -f -- $(externals_src)/iem16/src/configure
! 	-rm -f -- $(externals_src)/iem16/src/Make.config
! 	-rm -f -- $(externals_src)/iem16/src/*.o
! 	-rm -f -- $(externals_src)/iem16/src/*.bak
! 	-rm -f -- $(externals_src)/iem16/src/*.*~
--- 1246,1259 ----
iem16_clean:
! 	-$(MAKE) -C $(IEM16_DIR) clean
! 	-rm -f -- $(IEM16_DIR)/*.$(EXTENSION)
! 	-rm -f -- $(IEM16_DIR)/*.d
! 	-rm -rf -- $(IEM16_DIR)/autom4ate
! 	-rm -rf -- $(IEM16_DIR)/conf[0-9][0-9][0-9]*
! 	-rm -f -- $(IEM16_DIR)/configure
! 	-rm -f -- $(IEM16_DIR)/Make.config
! 	-rm -f -- $(IEM16_DIR)/*.o
! 	-rm -f -- $(IEM16_DIR)/*.bak
! 	-rm -f -- $(IEM16_DIR)/*.*~