externals/iem/iem_ambi/src Make.config.in, 1.1, 1.2 Makefile, 1.1, 1.2 configure.ac, 1.1, 1.2 iem_ambi.c, 1.1, 1.2 iem_ambi_sources.h, 1.1, 1.2 iem_bin_ambi_sources.c, 1.1, NONE - Pd-cvs

9 Mar 2006


      Update of /cvsroot/pure-data/externals/iem/iem_ambi/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10032
Modified Files:
    Make.config.in Makefile configure.ac iem_ambi.c 
    iem_ambi_sources.h 
Removed Files:
    iem_bin_ambi_sources.c 
Log Message:
fixed build-system
Index: iem_ambi.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iem_ambi/src/iem_ambi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iem_ambi.c	9 Mar 2006 17:05:43 -0000	1.1
--- iem_ambi.c	9 Mar 2006 17:38:37 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  #include "m_pd.h"
  #include "iemlib.h"
+ #include "iem_ambi_sources.h"
static t_class *iem_ambi_class;
***************
*** 22,42 ****
  }
- void ambi_encode_setup(void);
- void ambi_decode_setup(void);
- void ambi_decode2_setup(void);
- void ambi_decode3_setup(void);
- void ambi_decode_cube_setup(void);
- void ambi_rot_setup(void);
- 
  /* ------------------------ setup routine ------------------------- */
void iem_ambi_setup(void)
  {
! 	ambi_encode_setup();
! 	ambi_decode_setup();
! 	ambi_decode2_setup();
! 	ambi_decode3_setup();
! 	ambi_decode_cube_setup();
! 	ambi_rot_setup();
post("iem_ambi (R-1.16) library loaded!   (c) Thomas Musil 05.2005");
--- 23,31 ----
  }
/* ------------------------ setup routine ------------------------- */
void iem_ambi_setup(void)
  {
! 	iem_ambi_sources_setup();
post("iem_ambi (R-1.16) library loaded!   (c) Thomas Musil 05.2005");
--- iem_bin_ambi_sources.c DELETED ---
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iem_ambi/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	9 Mar 2006 17:05:43 -0000	1.1
--- Makefile	9 Mar 2006 17:38:37 -0000	1.2
***************
*** 12,17 ****
  endif
! iem_bin_ambi_sources.c iem_bin_ambi_sources.h:
! 	./makesource.sh
configure: configure.ac
--- 12,17 ----
  endif
! iem_ambi_sources.c iem_ambi_sources.h:
! 	sh ./makesource.sh
configure: configure.ac
***************
*** 47,51 ****
    cp $(LIBNAME).$(EXT) ..
! $(LIBNAME): $(TARGETS) iem_bin_ambi_sources.c iem_bin_ambi_sources.h
    $(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
    $(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT)
--- 47,51 ----
    cp $(LIBNAME).$(EXT) ..
! $(LIBNAME): $(TARGETS) iem_ambi_sources.c iem_ambi_sources.h
    $(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
    $(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT)
Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iem_ambi/src/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.ac	9 Mar 2006 17:05:43 -0000	1.1
--- configure.ac	9 Mar 2006 17:38:37 -0000	1.2
***************
*** 1,4 ****
  dnl  Process this file with autoconf to produce a configure script.
! AC_INIT(iem_bin_ambi.c)
dnl Checks for programs.
--- 1,4 ----
  dnl  Process this file with autoconf to produce a configure script.
! AC_INIT(iem_ambi.c)
dnl Checks for programs.
***************
*** 19,23 ****
AC_ARG_WITH(pdversion, [  --with-pdversion=<ver>  enforce a certain pd-version (e.g. 0.37)])
! AC_ARG_WITH(version,   [  --with-version=<ver>    enforce a certain iem_bin_ambi-version (e.g. 0.1)])
  AC_ARG_WITH(extension, [  --with-extension=<ext>  enforce a certain extension for the dynamic library (e.g. dll)])
  AC_ARG_WITH(pdpath,    [  --with-pd=</path/to/pd> where to look for pd-headers and and -libs])
--- 19,23 ----
AC_ARG_WITH(pdversion, [  --with-pdversion=<ver>  enforce a certain pd-version (e.g. 0.37)])
! AC_ARG_WITH(version,   [  --with-version=<ver>    enforce a certain iem_ambi-version (e.g. 0.1)])
  AC_ARG_WITH(extension, [  --with-extension=<ext>  enforce a certain extension for the dynamic library (e.g. dll)])
  AC_ARG_WITH(pdpath,    [  --with-pd=</path/to/pd> where to look for pd-headers and and -libs])
***************
*** 254,259 ****
! dnl check for iem_bin_ambi-version (but why...)
! AC_MSG_CHECKING("iem_bin_ambi-version")
if test "$with_version" != ""
--- 254,259 ----
! dnl check for iem_ambi-version (but why...)
! AC_MSG_CHECKING("iem_ambi-version")
if test "$with_version" != ""
***************
*** 267,271 ****
  cat > conftest.c << EOF
  #include <stdio.h>
! #include "iem_bin_ambi.h"
  int main(){
    printf("%s\n", VERSION);
--- 267,271 ----
  cat > conftest.c << EOF
  #include <stdio.h>
! #include "iem_ambi.h"
  int main(){
    printf("%s\n", VERSION);
Index: iem_ambi_sources.h
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iem_ambi/src/iem_ambi_sources.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iem_ambi_sources.h	9 Mar 2006 17:05:43 -0000	1.1
--- iem_ambi_sources.h	9 Mar 2006 17:38:37 -0000	1.2
***************
*** 1,4 ****
! /* iem_bin_ambi-setup autogenerated header-file
!  * generated by "./makesource.sh"
   * !! DO NOT MANUALLY EDIT  !!
   */
--- 1,4 ----
! /* iem_ambi-setup autogenerated header-file
!  * generated by "makesource.sh"
   * !! DO NOT MANUALLY EDIT  !!
   */
***************
*** 6,11 ****
  #ifndef IEMAMBI_SOURCES_H__
  #define IEMAMBI_SOURCES_H__
! void bin_ambi_calc_HRTF_setup(void); /* bin_ambi_calc_HRTF.c */
! void bin_ambi_reduced_decode_setup(void); /* bin_ambi_reduced_decode.c */
! #endif /* IEMBINAMBI_SOURCES_H__ */
--- 6,15 ----
  #ifndef IEMAMBI_SOURCES_H__
  #define IEMAMBI_SOURCES_H__
! void ambi_decode2_setup(void); /* ambi_decode2.c */
! void ambi_decode3_setup(void); /* ambi_decode3.c */
! void ambi_decode_setup(void); /* ambi_decode.c */
! void ambi_decode_cube_setup(void); /* ambi_decode_cube.c */
! void ambi_encode_setup(void); /* ambi_encode.c */
! void ambi_rot_setup(void); /* ambi_rot.c */
! #endif /* IEMAMBI_SOURCES_H__ */
Index: Make.config.in
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iem_ambi/src/Make.config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Make.config.in	9 Mar 2006 17:05:43 -0000	1.1
--- Make.config.in	9 Mar 2006 17:38:37 -0000	1.2
***************
*** 1,3 ****
! LIBNAME    =iem_bin_ambi
PREFIX     =@prefix@@PDLIBDIR@
--- 1,3 ----
! LIBNAME    =iem_ambi
PREFIX     =@prefix@@PDLIBDIR@
***************
*** 19,23 ****
  WFLAGS =
! TARNAME =  $(LIBNAME)-@IEMBINAMBI_VERSION@.tgz
# ICCFLAGS=-march=pentiumiii -axK
--- 19,23 ----
  WFLAGS =
! TARNAME =  $(LIBNAME)-@IEMAMBI_VERSION@.tgz
# ICCFLAGS=-march=pentiumiii -axK