From 678202cd7c9e75891bc1a7a73c57bf371f03a554 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Mon, 8 Nov 2010 21:19:41 -0500
Subject: [PATCH] math: Move mathcommon.h to toplevel include.

---
 include/Makefile.inc                    | 3 ++-
 {src/math => include/cstd}/mathcommon.h | 4 ++--
 src/math/Makefile.inc                   | 5 ++---
 src/math/exp.c                          | 2 +-
 src/math/fmax.c                         | 2 +-
 src/math/fmin.c                         | 2 +-
 src/math/nan.c                          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename {src/math => include/cstd}/mathcommon.h (78%)

diff --git a/include/Makefile.inc b/include/Makefile.inc
index 3473d81..eacc510 100644
--- a/include/Makefile.inc
+++ b/include/Makefile.inc
@@ -1 +1,2 @@
-noinst_HEADERS += include/assert.h include/stdbool.h include/cstd/locale.h
+noinst_HEADERS += include/assert.h include/stdbool.h include/cstd/locale.h \
+                  include/cstd/mathcommon.h
diff --git a/src/math/mathcommon.h b/include/cstd/mathcommon.h
similarity index 78%
rename from src/math/mathcommon.h
rename to include/cstd/mathcommon.h
index 9e5733b..cd4ffb9 100644
--- a/src/math/mathcommon.h
+++ b/include/cstd/mathcommon.h
@@ -1,5 +1,5 @@
-#ifndef MATH_COMMON_H_
-#define MATH_COMMON_H_
+#ifndef _CSTD_MATH_COMMON_H_
+#define _CSTD_MATH_COMMON_H_
 
 #include <math.h>
 
diff --git a/src/math/Makefile.inc b/src/math/Makefile.inc
index 51be421..fba6521 100644
--- a/src/math/Makefile.inc
+++ b/src/math/Makefile.inc
@@ -1,12 +1,11 @@
 noinst_LTLIBRARIES += src/math/libm.la src/math/libmf.la src/math/libml.la
 libcstd_la_LIBADD  += src/math/libm.la src/math/libmf.la src/math/libml.la
-noinst_HEADERS     += src/math/mathcommon.h
 
-src_math_libmf_la_CPPFLAGS = -DTYPE="float" -DSUFFIX=f
+src_math_libmf_la_CPPFLAGS = $(AM_CPPFLAGS) -DTYPE="float" -DSUFFIX=f
 src_math_libmf_la_LDFLAGS  = $(src_math_libm_la_LDFLAGS)
 src_math_libmf_la_SOURCES  = $(src_math_libm_la_SOURCES)
 
-src_math_libml_la_CPPFLAGS = -DTYPE="long double" -DSUFFIX=l
+src_math_libml_la_CPPFLAGS = $(AM_CPPFLAGS) -DTYPE="long double" -DSUFFIX=l
 src_math_libml_la_LDFLAGS  = $(src_math_libm_la_LDFLAGS)
 src_math_libml_la_SOURCES  = $(src_math_libm_la_SOURCES)
 
diff --git a/src/math/exp.c b/src/math/exp.c
index 230a538..548318b 100644
--- a/src/math/exp.c
+++ b/src/math/exp.c
@@ -8,7 +8,7 @@
  * There is NO WARRANTY, to the extent permitted by law.
  */
 
-#include "mathcommon.h"
+#include <cstd/mathcommon.h>
 
 TYPE MF(exp)(TYPE x)
 {
diff --git a/src/math/fmax.c b/src/math/fmax.c
index cacfdec..39dcf05 100644
--- a/src/math/fmax.c
+++ b/src/math/fmax.c
@@ -8,7 +8,7 @@
  * There is NO WARRANTY, to the extent permitted by law.
  */
 
-#include "mathcommon.h"
+#include <cstd/mathcommon.h>
 
 TYPE MF(fmax)(TYPE x, TYPE y)
 {
diff --git a/src/math/fmin.c b/src/math/fmin.c
index f1f0fda..107cc62 100644
--- a/src/math/fmin.c
+++ b/src/math/fmin.c
@@ -8,7 +8,7 @@
  * There is NO WARRANTY, to the extent permitted by law.
  */
 
-#include "mathcommon.h"
+#include <cstd/mathcommon.h>
 
 TYPE MF(fmin)(TYPE x, TYPE y)
 {
diff --git a/src/math/nan.c b/src/math/nan.c
index 851c60c..68f9c0d 100644
--- a/src/math/nan.c
+++ b/src/math/nan.c
@@ -8,7 +8,7 @@
  * There is NO WARRANTY, to the extent permitted by law.
  */
 
-#include "mathcommon.h"
+#include <cstd/mathcommon.h>
 
 TYPE MF(nan)(const char *tagp)
 {
-- 
2.11.4.GIT