[Xenomai-core] [PATCH] cleanup xeno-config output

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1.1: Type: text/plain, Size: 287 bytes --]

Following the discussion in an earlier thread, this patch reduces the
CFLAGS and LDFLAGS returned by xeno-config to the required minimum.

Compile tested with several external packages, no regression known
(except that one may want to set some of those flags elsewhere now).

Jan

[-- Attachment #1.2: xeno-config-cleanup.patch --]
[-- Type: text/plain, Size: 3437 bytes --]

---
 ChangeLog              |    8 +++++++-
 configure.in           |   13 ++++++-------
 scripts/xeno-config.in |    4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -497,21 +497,23 @@ else
 fi
 AC_MSG_RESULT([done])
 
-XENO_USER_CFLAGS="-D_GNU_SOURCE -D_REENTRANT -D__XENO__"
+dnl Common CFLAGS and LDFLAGS
+XENO_USER_CFLAGS="-D_GNU_SOURCE -D_REENTRANT"
 XENO_USER_LDFLAGS=
 
+dnl Exported CFLAGS and LDFLAGS, may be enhanced per-arch below
+XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
+XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
+
 case $XENO_TARGET_ARCH in
  i386)
 	XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall -pipe -fstrict-aliasing $gcc_w_noalias"
-	XENO_USER_LDFLAGS="-rdynamic"
         ;;
  powerpc)
 	XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall -pipe"
-	XENO_USER_LDFLAGS="-rdynamic"
         ;;
  ia64)
 	XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall -pipe"
-	XENO_USER_LDFLAGS="-rdynamic"
         ;;
  blackfin)
 	XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall -pipe"
@@ -521,7 +523,6 @@ case $XENO_TARGET_ARCH in
         ;;
  arm)
 	XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall -pipe"
-	XENO_USER_LDFLAGS="-rdynamic"
         ;;
 esac
 
@@ -531,9 +532,7 @@ else
    XENO_USER_CFLAGS="-O2 $XENO_USER_CFLAGS"
 fi
 
-XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
 XENO_USER_CFLAGS="$XENO_USER_CFLAGS -D__IN_XENO__ -Wstrict-prototypes"
-XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
 
 AC_MSG_CHECKING([whether ld supports @file])
 AC_CACHE_VAL(ac_cv_ld_file_option,
Index: scripts/xeno-config.in
===================================================================
--- scripts/xeno-config.in.orig
+++ scripts/xeno-config.in
@@ -12,9 +12,9 @@ XENO_VERSION="@PACKAGE_VERSION@"
 XENO_PREFIX="${staging}${prefix}"
 XENO_CC="@CC@"
 XENO_TARGET_ARCH="@XENO_TARGET_ARCH@"
-XENO_BASE_CFLAGS="-I. -I${staging}${includedir} @XENO_USER_APP_CFLAGS@"
+XENO_BASE_CFLAGS="-I${staging}${includedir} @XENO_USER_APP_CFLAGS@"
 XENO_BASE_LDFLAGS="-L${staging}${libdir} -lpthread @XENO_USER_APP_LDFLAGS@"
-XENO_POSIX_CFLAGS="-I. -I${staging}${includedir} -I${staging}${includedir}/posix @XENO_USER_APP_CFLAGS@"
+XENO_POSIX_CFLAGS="-I${staging}${includedir} -I${staging}${includedir}/posix @XENO_USER_APP_CFLAGS@ -D__XENO__"
 XENO_POSIX_LDFLAGS="-L${staging}${libdir} -lpthread_rt -lpthread -lrt @XENO_USER_APP_LDFLAGS@"
 XENO_POSIX_WRAPPERS="${staging}${libdir}/posix.wrappers"
 XENO_POSIX_FAST_WRAPPING="@LD_FILE_OPTION@"
Index: ChangeLog
===================================================================
--- ChangeLog.orig
+++ ChangeLog
@@ -1,3 +1,9 @@
+2006-10-09  Jan Kiszka  <jan.kiszka@domain.hid>
+
+	* configure.in, scripts/xeno-config.in: Reducing CFLAGS and LDFLAGS
+	return by xeno-config to the required minimum while keeping the
+	original flags internally.
+
 2006-10-08  Gilles Chanteperdrix  <gilles.chanteperdrix@xenomai.org>
 
 	* src/testsuite/*/Makefile.am: Link with libtool libraries, in
@@ -9,7 +15,7 @@
 	* include/rtdm/rtdm_driver.h (rtdm_*copy_to/from_user): Fix
 	return code.
 
-	* ksrc/skins/rtdm/drvlib.c (rtdm_strncpy_from_user): Adopt doc to
+	* ksrc/skins/rtdm/drvlib.c (rtdm_strncpy_from_user): Adapt doc to
 	actual success return code, the string length.
 
 2006-10-08  Wolfgang Grandegger  <wg@domain.hid>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]