fixed build-system

svn path=/trunk/externals/iem/iem_ambi/; revision=4671

6 files changed, 21 insertions, 41 deletions

diff --git a/src/Make.config.in b/src/Make.config.in
index 8bba163..21cb481 100644
--- a/src/Make.config.in
+++ b/src/Make.config.in
@@ -1,4 +1,4 @@
-LIBNAME    =iem_bin_ambi
+LIBNAME    =iem_ambi
 
 PREFIX     =@prefix@@PDLIBDIR@
 
@@ -18,7 +18,7 @@ AFLAGS =
 LFLAGS = @LFLAGS@
 WFLAGS =
 
-TARNAME =  $(LIBNAME)-@IEMBINAMBI_VERSION@.tgz
+TARNAME =  $(LIBNAME)-@IEMAMBI_VERSION@.tgz
 
 # ICCFLAGS=-march=pentiumiii -axK
 Z_CFLAGS = $(IFLAGS) $(DEFS) -DPD $(WFLAGS) @CFLAGS@ $(CFLAGS)
diff --git a/src/Makefile b/src/Makefile
index 8e18398..9d90699 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,8 +11,8 @@ Make.config: Make.config.in configure
 	./configure
 endif
 
-iem_bin_ambi_sources.c iem_bin_ambi_sources.h:
-	./makesource.sh
+iem_ambi_sources.c iem_ambi_sources.h:
+	sh ./makesource.sh
 
 configure: configure.ac
 	autoconf
@@ -46,7 +46,7 @@ TARGETS = $(SOURCES:.c=.o)
 all: $(LIBNAME)
 	cp $(LIBNAME).$(EXT) ..
 
-$(LIBNAME): $(TARGETS) iem_bin_ambi_sources.c iem_bin_ambi_sources.h
+$(LIBNAME): $(TARGETS) iem_ambi_sources.c iem_ambi_sources.h
 	$(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
 	$(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT)
 
diff --git a/src/configure.ac b/src/configure.ac
index 937ec7f..ab36779 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,5 +1,5 @@
 dnl  Process this file with autoconf to produce a configure script.
-AC_INIT(iem_bin_ambi.c)
+AC_INIT(iem_ambi.c)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -18,7 +18,7 @@ AC_SUBST(INCLUDES)
 
 
 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(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])
 AC_ARG_ENABLE(PIC,     [  --disable-PIC           disable compilation with PIC-flag])
@@ -253,8 +253,8 @@ else
 fi
 
 
-dnl check for iem_bin_ambi-version (but why...)
-AC_MSG_CHECKING("iem_bin_ambi-version")
+dnl check for iem_ambi-version (but why...)
+AC_MSG_CHECKING("iem_ambi-version")
 
 if test "$with_version" != ""
 then
@@ -266,7 +266,7 @@ if test "x$cross_compiling" = "xno"
 then
 cat > conftest.c << EOF
 #include <stdio.h>
-#include "iem_bin_ambi.h"
+#include "iem_ambi.h"
 int main(){
   printf("%s\n", VERSION);
   return 0;
diff --git a/src/iem_ambi.c b/src/iem_ambi.c
index 7b06298..8cadc53 100644
--- a/src/iem_ambi.c
+++ b/src/iem_ambi.c
@@ -11,6 +11,7 @@ iem_ambi written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005
 
 #include "m_pd.h"
 #include "iemlib.h"
+#include "iem_ambi_sources.h"
 
 static t_class *iem_ambi_class;
 
@@ -21,23 +22,11 @@ static void *iem_ambi_new(void)
 	return (x);
 }
 
-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();
+	iem_ambi_sources_setup();
 
     post("iem_ambi (R-1.16) library loaded!   (c) Thomas Musil 05.2005");
 	post("   musil%ciem.at iem KUG Graz Austria", '@');
diff --git a/src/iem_ambi_sources.h b/src/iem_ambi_sources.h
index cf24fb7..9af6599 100644
--- a/src/iem_ambi_sources.h
+++ b/src/iem_ambi_sources.h
@@ -1,11 +1,15 @@
-/* iem_bin_ambi-setup autogenerated header-file
- * generated by "./makesource.sh"
+/* iem_ambi-setup autogenerated header-file
+ * generated by "makesource.sh"
  * !! DO NOT MANUALLY EDIT  !!
  */
 
 #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__ */
+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__ */
 
diff --git a/src/iem_bin_ambi_sources.c b/src/iem_bin_ambi_sources.c
deleted file mode 100644
index 6d45134..0000000
--- a/src/iem_bin_ambi_sources.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* iem_bin_ambi-setup autogenerated setup-file
- * generated by "./makesource.sh"
- * !! DO NOT MANUALLY EDIT  !!
- */
-
-#include "iem_bin_ambi_sources.h"
-
-void iem_bin_ambi_sources_setup(void)
-{
-	bin_ambi_calc_HRTF_setup(); /* bin_ambi_calc_HRTF.c */
-	bin_ambi_reduced_decode_setup(); /* bin_ambi_reduced_decode.c */
-}
-