Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19155
Modified Files:
Makefile
Log Message:
got make to handle autoconf and ./configure properly
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile 16 Dec 2005 16:42:27 -0000 1.23
--- Makefile 16 Dec 2005 17:30:06 -0000 1.24
***************
*** 171,174 ****
--- 171,176 ----
install -p \
$(externals_src)/pdogg/*/*.pd \
+ $(externals_src)/pdp/doc/objects/*.* \
+ $(externals_src)/pidip/doc/*.pd \
$(externals_src)/plugin~/*.pd \
$(externals_src)/rhythm_estimator/*.p? \
***************
*** 308,312 ****
cyclone_clean:
! cd $(externals_src)/miXed/cyclone && make $(DEST_PATHS) clean
--- 310,314 ----
cyclone_clean:
! -make -C $(externals_src)/miXed/cyclone $(DEST_PATHS) clean
***************
*** 646,654 ****
#----------------------------------------------------------------------------
# OSCx
! oscx:
! test -e $(externals_src)/OSCx/Makefile || \
! (cd $(externals_src)/OSCx && ./configure)
! # these don't work on Windows yet
! cd $(externals_src)/OSCx && $(MAKE) CC=gcc
oscx_install: oscx
--- 648,664 ----
#----------------------------------------------------------------------------
# OSCx
! OSCX_NAME=oscx
! $(externals_src)/OSCx/configure: $(externals_src)/OSCx/configure.ac
! cd $(externals_src)/OSCx && autoconf
!
! $(externals_src)/OSCx/Makefile: $(externals_src)/OSCx/Makefile.in
! cd $(externals_src)/OSCx && ./configure
!
! $(externals_src)/OSCx/src/OSC.$(EXTENSION): $(externals_src)/OSCx/configure \
! $(externals_src)/OSCx/Makefile
! -make -C $(externals_src)/OSCx CC=gcc
!
! oscx: $(externals_src)/OSCx/src/OSC.$(EXTENSION)
!
oscx_install: oscx
***************
*** 656,660 ****
install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)
install -d $(helpdir)
! install -p $(externals_src)/OSCx/doc/*.* $(helpdir)
--- 666,670 ----
install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)
install -d $(helpdir)
! install -p $(externals_src)/OSCx/doc/*.* $(helpdir)/$(OSCX_NAME)
***************
*** 688,692 ****
pddp_clean:
! cd $(externals_src)/mixed/pddp && make $(DEST_PATHS) clean
--- 698,702 ----
pddp_clean:
! -make -C $(externals_src)/mixed/pddp $(DEST_PATHS) clean
***************
*** 701,707 ****
cd $(externals_src)/pdp && ./configure
! pdp: $(externals_src)/pdp/configure $(externals_src)/pdp/Makefile.config
-make -C $(externals_src)/pdp
pdp_install: pdp
# install -d $(objectsdir)/$(PDP_NAME)
--- 711,720 ----
cd $(externals_src)/pdp && ./configure
! $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/configure \
! $(externals_src)/pdp/Makefile.config
-make -C $(externals_src)/pdp
+ pdp: $(externals_src)/pdp/pdp.$(EXTENSION)
+
pdp_install: pdp
# install -d $(objectsdir)/$(PDP_NAME)
***************
*** 714,719 ****
install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)
install -d $(helpdir)/$(PDP_NAME)
! # install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)/$(PDP_NAME)
! install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)
install -d $(manualsdir)/$(PDP_NAME)
install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME)
--- 727,731 ----
install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)
install -d $(helpdir)/$(PDP_NAME)
! install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)/$(PDP_NAME)
install -d $(manualsdir)/$(PDP_NAME)
install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME)
***************
*** 726,731 ****
pdp_clean:
-rm -f -- $(externals_src)/pdp/*.$(EXTENSION)
! -find $(externals_src)/pdp -name '*.o' -delete
! -find $(externals_src)/pdp -name '*.bak' -delete
-rm -f -- $(externals_src)/pdp/Makefile.config
-rm -f -- $(externals_src)/pdp/configure
--- 738,743 ----
pdp_clean:
-rm -f -- $(externals_src)/pdp/*.$(EXTENSION)
! -find $(externals_src)/pdp -name '*.o' | xargs rm -f --
! -find $(externals_src)/pdp -name '*.bak' | xargs rm -f --
-rm -f -- $(externals_src)/pdp/Makefile.config
-rm -f -- $(externals_src)/pdp/configure
***************
*** 741,746 ****
cd $(externals_src)/pidip && ./configure --with-pd=../../pd --with-pdp=../pdp
! pidip: $(externals_src)/pidip/configure $(externals_src)/pidip/Makefile
! make -C $(externals_src)/pidip
pidip_install:
--- 753,761 ----
cd $(externals_src)/pidip && ./configure --with-pd=../../pd --with-pdp=../pdp
! $(externals_src)/pidip/pidip.$(EXTENSION): $(externals_src)/pidip/configure \
! $(externals_src)/pidip/Makefile
! -make -C $(externals_src)/pidip
!
! pidip: $(externals_src)/pidip/pidip.$(EXTENSION)
pidip_install:
***************
*** 766,770 ****
pidip_clean:
-rm -f -- $(externals_src)/pidip/*.$(EXTENSION)
! -find $(externals_src)/pidip -name '*.o' -delete
-rm -f -- $(externals_src)/pidip/*.bak
-rm -f -- $(externals_src)/pidip/Makefile
--- 781,785 ----
pidip_clean:
-rm -f -- $(externals_src)/pidip/*.$(EXTENSION)
! -find $(externals_src)/pidip -name '*.o' | xargs rm -f --
-rm -f -- $(externals_src)/pidip/*.bak
-rm -f -- $(externals_src)/pidip/Makefile
***************
*** 797,803 ****
pmpd_clean:
-rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION))
! -find $(externals_src)/pmpd -name '*.o' -delete
! -find $(externals_src)/pmpd -name '*.bak' -delete
! -find $(externals_src)/pmpd -name '*~' -delete
--- 812,818 ----
pmpd_clean:
-rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION))
! -find $(externals_src)/pmpd -name '*.o' | xargs rm -f --
! -find $(externals_src)/pmpd -name '*.bak' | xargs rm -f --
! -find $(externals_src)/pmpd -name '*~' | xargs rm -f --
***************
*** 857,861 ****
toxy_clean:
! cd $(externals_src)/mixed/toxy && make $(DEST_PATHS) clean
--- 872,876 ----
toxy_clean:
! -make -C $(externals_src)/mixed/toxy $(DEST_PATHS) clean