[Liboil-commit] configure.ac liboil/arm

[David Schleef]

 configure.ac           |    9 +++++----
 liboil/arm/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 9062796b59dc90bf396220c1347382033fa5fed1
Author: David Schleef <ds at ginger.bigkitten.com>
Date:   Thu Mar 13 16:52:26 2008 -0700

    Move VFP related flags to VFP_FLAGS

diff --git a/configure.ac b/configure.ac
index bb83e9b..764fa21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,12 +174,13 @@ fi
 
 if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
   AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
-    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"],
-    true)
-  AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
-    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfloat-abi=softfp"],
+    [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
     true)
+  #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
+  #  [VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"],
+  #  true)
 fi
+AC_SUBST(VFP_CFLAGS)
 
 #AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no)
 HAVE_ASM_BLOCKS=no
diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am
index 5607f74..ead08ed 100644
--- a/liboil/arm/Makefile.am
+++ b/liboil/arm/Makefile.am
@@ -5,5 +5,5 @@ libarm_la_SOURCES = \
 	math_vfp.c \
 	math_vfp_asm.S
 
-libarm_la_CFLAGS = $(LIBOIL_CFLAGS)
+libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)