[Freeswitch-trunk] [commit] r13672 - in freeswitch/trunk/libs/libg722_1: . src

[FreeSWITCH SVN]

Author: mikej
Date: Mon Jun  8 11:25:28 2009
New Revision: 13672

Log:
don't build files that will have no contents due to ifdefs

Removed:
   freeswitch/trunk/libs/libg722_1/configure
Modified:
   freeswitch/trunk/libs/libg722_1/.update
   freeswitch/trunk/libs/libg722_1/configure.ac
   freeswitch/trunk/libs/libg722_1/src/Makefile.am

Modified: freeswitch/trunk/libs/libg722_1/.update
==============================================================================
--- freeswitch/trunk/libs/libg722_1/.update	(original)
+++ freeswitch/trunk/libs/libg722_1/.update	Mon Jun  8 11:25:28 2009
@@ -1 +1 @@
-Wed Dec 10 12:08:07 CST 2008
+Mon Jun  8 12:13:41 EDT 2009

Modified: freeswitch/trunk/libs/libg722_1/configure.ac
==============================================================================
--- freeswitch/trunk/libs/libg722_1/configure.ac	(original)
+++ freeswitch/trunk/libs/libg722_1/configure.ac	Mon Jun  8 11:25:28 2009
@@ -289,14 +289,20 @@
 if test "$enable_fixed_point" = "yes" ; then
     AC_DEFINE([G722_1_USE_FIXED_POINT], [1], [Enable fixed point processing, where possible, instead of floating point])
     G722_1_USE_FIXED_POINT="#define G722_1_USE_FIXED_POINT 1"
+    fixed = "yes"
     G722_1_VECTORS_FOR_TESTS="fixed"
 else
     AX_FIXED_POINT_MACHINE([$host],
-        [AC_DEFINE([G722_1_USE_FIXED_POINT], [1], [Enable fixed point processing, where possible, instead of floating point])
-        G722_1_USE_FIXED_POINT="#define G722_1_USE_FIXED_POINT 1"],
+        [
+	AC_DEFINE([G722_1_USE_FIXED_POINT], [1], [Enable fixed point processing, where possible, instead of floating point])
+        G722_1_USE_FIXED_POINT="#define G722_1_USE_FIXED_POINT 1"
+	fixed = "yes"
+	],
         [G722_1_USE_FIXED_POINT="#undef G722_1_USE_FIXED_POINT"])
     G722_1_VECTORS_FOR_TESTS="floating"
 fi
+AM_CONDITIONAL([COND_FIXED], [test "$fixed" = "yes"])
+
 AX_MISALIGNED_ACCESS_FAILS([$host],
     [AC_DEFINE([G722_1_MISALIGNED_ACCESS_FAILS], [1], [Do not expect a misaligned memory access to work correctly])
     G722_1_MISALIGNED_ACCESS_FAILS="#define G722_1_MISALIGNED_ACCESS_FAILS 1"],

Modified: freeswitch/trunk/libs/libg722_1/src/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/libg722_1/src/Makefile.am	(original)
+++ freeswitch/trunk/libs/libg722_1/src/Makefile.am	Mon Jun  8 11:25:28 2009
@@ -42,8 +42,7 @@
 
 lib_LTLIBRARIES = libg722_1.la
 
-libg722_1_la_SOURCES = basop32.c \
-                       bitstream.c \
+libg722_1_la_SOURCES = bitstream.c \
                        coef2sam.c \
                        common.c \
                        commonf.c \
@@ -58,6 +57,9 @@
                        sam2coef.c \
                        tables.c
 
+if COND_FIXED
+libg722_1_la_SOURCES += basop32.c
+endif
 libg722_1_la_LDFLAGS = -version-info @G722_1_LT_CURRENT@:@G722_1_LT_REVISION@:@G722_1_LT_AGE@ $(COMP_VENDOR_LDFLAGS)
 
 nobase_include_HEADERS = g722_1/g722_1.h \