* [Xenomai] [PATCH] xeno-config: remove duplicate include flags, already present in XENO_BASE_CFLAGS
@ 2013-06-19 19:38 Thomas De Schampheleire
2013-06-21 12:21 ` Philippe Gerum
0 siblings, 1 reply; 2+ messages in thread
From: Thomas De Schampheleire @ 2013-06-19 19:38 UTC (permalink / raw)
To: xenomai
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
scripts/xeno-config-cobalt.in | 6 +++---
scripts/xeno-config-mercury.in | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in
--- a/scripts/xeno-config-cobalt.in
+++ b/scripts/xeno-config-cobalt.in
@@ -13,10 +13,10 @@ XENO_VERSION="@PACKAGE_VERSION@"
XENO_PREFIX="${staging}${prefix}"
XENO_CC="@CC@"
XENO_TARGET_ARCH="@XENO_TARGET_ARCH@"
-XENO_BASE_CFLAGS="-I${staging}${includedir} @XENO_USER_APP_CFLAGS@ -D__COBALT__"
+XENO_INCLUDE_DIR="${staging}${includedir}"
+XENO_BASE_CFLAGS="-I$XENO_INCLUDE_DIR @XENO_USER_APP_CFLAGS@ -D__COBALT__"
XENO_POSIX_LDFLAGS="-L${staging}${libdir} -lcobalt -lpthread -lrt @XENO_USER_APP_LDFLAGS@"
XENO_LIBRARY_DIR="${staging}${libdir}"
-XENO_INCLUDE_DIR="${staging}${includedir}"
LD_FILE_OPTION="@LD_FILE_OPTION@"
unset prefix exec_prefix libdir datadir datarootdir pkgdatadir includedir skin_list
@@ -111,7 +111,7 @@ while test $# -gt 0; do
echo "no skin specified, missing --skin before --cflags" 1>&2
exit 1
fi
- cflags="$XENO_BASE_CFLAGS -I$XENO_INCLUDE_DIR/cobalt -I$XENO_INCLUDE_DIR"
+ cflags="$XENO_BASE_CFLAGS -I$XENO_INCLUDE_DIR/cobalt"
for skin in $skin_list; do
case "$skin" in
posix|cobalt)
diff --git a/scripts/xeno-config-mercury.in b/scripts/xeno-config-mercury.in
--- a/scripts/xeno-config-mercury.in
+++ b/scripts/xeno-config-mercury.in
@@ -13,10 +13,10 @@ XENO_VERSION="@PACKAGE_VERSION@"
XENO_PREFIX="${staging}${prefix}"
XENO_CC="@CC@"
XENO_TARGET_ARCH="@XENO_BUILD_STRING@"
-XENO_BASE_CFLAGS="-I${staging}${includedir} @XENO_USER_APP_CFLAGS@ -D__MERCURY__"
+XENO_INCLUDE_DIR="${staging}${includedir}"
+XENO_BASE_CFLAGS="-I$XENO_INCLUDE_DIR @XENO_USER_APP_CFLAGS@ -D__MERCURY__"
XENO_BASE_LDFLAGS="-L${staging}${libdir} @XENO_USER_APP_LDFLAGS@ -lcopperplate -lpthread -lrt"
XENO_LIBRARY_DIR="${staging}${libdir}"
-XENO_INCLUDE_DIR="${staging}${includedir}"
unset prefix exec_prefix libdir datadir datarootdir pkgdatadir includedir skin_list
@@ -90,7 +90,7 @@ while test $# -gt 0; do
echo "no skin specified, missing --skin before --cflags" 1>&2
exit 1
fi
- cflags="$XENO_BASE_CFLAGS -I$XENO_INCLUDE_DIR"
+ cflags="$XENO_BASE_CFLAGS"
for skin in $skin_list; do
case "$skin" in
vxworks|psos|alchemy)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Xenomai] [PATCH] xeno-config: remove duplicate include flags, already present in XENO_BASE_CFLAGS
2013-06-19 19:38 [Xenomai] [PATCH] xeno-config: remove duplicate include flags, already present in XENO_BASE_CFLAGS Thomas De Schampheleire
@ 2013-06-21 12:21 ` Philippe Gerum
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Gerum @ 2013-06-21 12:21 UTC (permalink / raw)
To: Thomas De Schampheleire; +Cc: xenomai
On 06/19/2013 09:38 PM, Thomas De Schampheleire wrote:
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
Merged, thanks.
--
Philippe.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-21 12:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-19 19:38 [Xenomai] [PATCH] xeno-config: remove duplicate include flags, already present in XENO_BASE_CFLAGS Thomas De Schampheleire
2013-06-21 12:21 ` Philippe Gerum
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.