[xiph-commits] r9215 - in trunk/speex: . include/speex win32

[jm at motherfish-iii.xiph.org]

Author: jm
Date: 2005-05-05 21:59:30 -0700 (Thu, 05 May 2005)
New Revision: 9215

Added:
   trunk/speex/include/speex/speex_config_types.h.in
Removed:
   trunk/speex/include/speex/speex_types.h.in
   trunk/speex/win32/speex_types.h
Modified:
   trunk/speex/Makefile.am
   trunk/speex/configure.ac
   trunk/speex/include/speex/Makefile.am
   trunk/speex/include/speex/speex_types.h
Log:
speex_types.h now contains definitions for all archs that don't use
autoconf


Modified: trunk/speex/Makefile.am
===================================================================
--- trunk/speex/Makefile.am	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/Makefile.am	2005-05-06 04:59:30 UTC (rev 9215)
@@ -13,9 +13,9 @@
 EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
 
 #Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32
+SUBDIRS = libspeex include @src@ doc win32 symbian
 
-DIST_SUBDIRS = libspeex include src doc win32
+DIST_SUBDIRS = libspeex include src doc win32 symbian
 
 rpm: dist
 	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/configure.ac	2005-05-06 04:59:30 UTC (rev 9215)
@@ -177,7 +177,8 @@
 AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
            include/Makefile include/speex/Makefile speex.pc
            win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
-           win32/speexdec/Makefile include/speex/speex_types.h ])
+           win32/speexdec/Makefile symbian/Makefile 
+           include/speex/speex_config_types.h ])
 
 if test "x$src" = "x"; then 
 echo "**IMPORTANT**"

Modified: trunk/speex/include/speex/Makefile.am
===================================================================
--- trunk/speex/include/speex/Makefile.am	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/include/speex/Makefile.am	2005-05-06 04:59:30 UTC (rev 9215)
@@ -1,9 +1,10 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-nodist_pkginclude_HEADERS = speex_types.h
+nodist_pkginclude_HEADERS = speex_config_types.h
 
 pkginclude_HEADERS =  speex.h \
+	speex_types.h \
 	speex_bits.h \
 	speex_header.h \
 	speex_callbacks.h \

Added: trunk/speex/include/speex/speex_config_types.h.in
===================================================================
--- trunk/speex/include/speex/speex_config_types.h.in	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/include/speex/speex_config_types.h.in	2005-05-06 04:59:30 UTC (rev 9215)
@@ -0,0 +1,11 @@
+#ifndef __SPEEX_TYPES_H__
+#define __SPEEX_TYPES_H__
+
+/* these are filled in by configure */
+typedef @SIZE16@ spx_int16_t;
+typedef unsigned @SIZE16@ spx_uint16_t;
+typedef @SIZE32@ spx_int32_t;
+typedef unsigned @SIZE32@ spx_uint32_t;
+
+#endif
+

Modified: trunk/speex/include/speex/speex_types.h
===================================================================
--- trunk/speex/include/speex/speex_types.h	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/include/speex/speex_types.h	2005-05-06 04:59:30 UTC (rev 9215)
@@ -113,7 +113,7 @@
 
 #else
 
-#  include <spx/config_types.h>
+#  include <speex/speex_config_types.h>
 
 #endif
 

Deleted: trunk/speex/include/speex/speex_types.h.in
===================================================================
--- trunk/speex/include/speex/speex_types.h.in	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/include/speex/speex_types.h.in	2005-05-06 04:59:30 UTC (rev 9215)
@@ -1,10 +0,0 @@
-#ifndef __SPEEX_TYPES_H__
-#define __SPEEX_TYPES_H__
-
-/* these are filled in by configure */
-typedef @SIZE16@ spx_int16_t;
-typedef @SIZE32@ spx_int32_t;
-typedef unsigned @SIZE32@ spx_uint32_t;
-
-#endif
-

Deleted: trunk/speex/win32/speex_types.h
===================================================================
--- trunk/speex/win32/speex_types.h	2005-05-06 04:47:41 UTC (rev 9214)
+++ trunk/speex/win32/speex_types.h	2005-05-06 04:59:30 UTC (rev 9215)
@@ -1,9 +0,0 @@
-#ifndef __SPEEX_TYPES_H__
-#define __SPEEX_TYPES_H__
-
-typedef short spx_int16_t;
-typedef int spx_int32_t;
-typedef unsigned int spx_uint32_t;
-
-#endif
-