Module: xenomai-2.5
Branch: master
Commit: 4f3d3f237eea4448ea760c64ea627425b31908a0
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=4f3d3f237eea4448ea760c64ea627425b31908a0
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Mon Apr 19 16:28:19 2010 +0200
bootstrap
---
configure | 18 +++++++-------
src/testsuite/irqbench/Makefile.in | 4 +-
src/testsuite/unit/Makefile.in | 44 +++++++++++++++++++++++++++++++++--
3 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index a95eb34..e0cce39 100755
--- a/configure
+++ b/configure
@@ -808,8 +808,8 @@ EGREP
GREP
SED
LIBTOOL
-XENO_LINUX_ARCH_I386_FALSE
-XENO_LINUX_ARCH_I386_TRUE
+XENO_TARGET_ARCH_X86_FALSE
+XENO_TARGET_ARCH_X86_TRUE
LEXLIB
LEX_OUTPUT_ROOT
LEX
@@ -5262,12 +5262,12 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XENO_TARGET_ARCH" >&5
$as_echo "$XENO_TARGET_ARCH" >&6; }
- if test $XENO_LINUX_ARCH = i386; then
- XENO_LINUX_ARCH_I386_TRUE=
- XENO_LINUX_ARCH_I386_FALSE='#'
+ if test $XENO_TARGET_ARCH = x86; then
+ XENO_TARGET_ARCH_X86_TRUE=
+ XENO_TARGET_ARCH_X86_FALSE='#'
else
- XENO_LINUX_ARCH_I386_TRUE='#'
- XENO_LINUX_ARCH_I386_FALSE=
+ XENO_TARGET_ARCH_X86_TRUE='#'
+ XENO_TARGET_ARCH_X86_FALSE=
fi
@@ -13032,8 +13032,8 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z
"${am__fastdepCCAS_FALSE}"; then
as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${XENO_LINUX_ARCH_I386_TRUE}" && test -z
"${XENO_LINUX_ARCH_I386_FALSE}"; then
- as_fn_error "conditional \"XENO_LINUX_ARCH_I386\" was never defined.
+if test -z "${XENO_TARGET_ARCH_X86_TRUE}" && test -z
"${XENO_TARGET_ARCH_X86_FALSE}"; then
+ as_fn_error "conditional \"XENO_TARGET_ARCH_X86\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${XENO_BUILD_LINUX_TRUE}" && test -z "${XENO_BUILD_LINUX_FALSE}";
then
diff --git a/src/testsuite/irqbench/Makefile.in
b/src/testsuite/irqbench/Makefile.in
index 2abea4c..4f5628c 100644
--- a/src/testsuite/irqbench/Makefile.in
+++ b/src/testsuite/irqbench/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
test_PROGRAMS = irqloop$(EXEEXT) $(am__EXEEXT_1)
-...@xeno_linux_arch_i386_true@am__append_1 = irqbench
+...@xeno_target_arch_x86_true@am__append_1 = irqbench
subdir = src/testsuite/irqbench
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -51,7 +51,7 @@ am__configure_deps = $(am__aclocal_m4_deps)
$(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h
CONFIG_CLEAN_FILES =
-...@xeno_linux_arch_i386_true@am__EXEEXT_1 = irqbench$(EXEEXT)
+...@xeno_target_arch_x86_true@am__EXEEXT_1 = irqbench$(EXEEXT)
am__installdirs = "$(DESTDIR)$(testdir)"
testPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(test_PROGRAMS)
diff --git a/src/testsuite/unit/Makefile.in b/src/testsuite/unit/Makefile.in
index 5125678..efc2783 100644
--- a/src/testsuite/unit/Makefile.in
+++ b/src/testsuite/unit/Makefile.in
@@ -36,7 +36,7 @@ target_triplet = @target@
test_PROGRAMS = arith$(EXEEXT) wakeup-time$(EXEEXT) \
mutex-torture-posix$(EXEEXT) mutex-torture-native$(EXEEXT) \
cond-torture-posix$(EXEEXT) cond-torture-native$(EXEEXT) \
- check-vdso$(EXEEXT)
+ check-vdso$(EXEEXT) rtdm$(EXEEXT)
subdir = src/testsuite/unit
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -105,6 +105,14 @@ mutex_torture_posix_DEPENDENCIES =
../../skins/posix/libpthread_rt.la \
mutex_torture_posix_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mutex_torture_posix_LDFLAGS) $(LDFLAGS) -o $@
+am_rtdm_OBJECTS = rtdm-rtdm.$(OBJEXT)
+rtdm_OBJECTS = $(am_rtdm_OBJECTS)
+rtdm_DEPENDENCIES = ../../skins/posix/libpthread_rt.la \
+ ../../skins/native/libnative.la \
+ ../../skins/common/libxenomai.la
+rtdm_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(rtdm_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_wakeup_time_OBJECTS = wakeup_time-wakeup-time.$(OBJEXT)
wakeup_time_OBJECTS = $(am_wakeup_time_OBJECTS)
wakeup_time_DEPENDENCIES = ../../skins/native/libnative.la \
@@ -126,11 +134,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) \
SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
$(cond_torture_native_SOURCES) $(cond_torture_posix_SOURCES) \
$(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
- $(wakeup_time_SOURCES)
+ $(rtdm_SOURCES) $(wakeup_time_SOURCES)
DIST_SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
$(cond_torture_native_SOURCES) $(cond_torture_posix_SOURCES) \
$(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
- $(wakeup_time_SOURCES)
+ $(rtdm_SOURCES) $(wakeup_time_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -376,6 +384,18 @@ check_vdso_LDADD = \
../../skins/common/libxenomai.la \
-lpthread -lm
+rtdm_SOURCES = rtdm.c
+rtdm_CPPFLAGS = \
+ -I$(top_srcdir)/include/posix @XENO_USER_CFLAGS@ -g -DXENO_POSIX \
+ -I$(top_srcdir)/include
+
+rtdm_LDFLAGS = $(XENO_POSIX_WRAPPERS) @XENO_USER_LDFLAGS@
+rtdm_LDADD = \
+ ../../skins/posix/libpthread_rt.la \
+ ../../skins/native/libnative.la \
+ ../../skins/common/libxenomai.la \
+ -lpthread -lrt -lm
+
EXTRA_DIST = runinfo.in
all: all-am
@@ -456,6 +476,9 @@ mutex-torture-native$(EXEEXT):
$(mutex_torture_native_OBJECTS) $(mutex_torture_n
mutex-torture-posix$(EXEEXT): $(mutex_torture_posix_OBJECTS)
$(mutex_torture_posix_DEPENDENCIES)
@rm -f mutex-torture-posix$(EXEEXT)
$(mutex_torture_posix_LINK) $(mutex_torture_posix_OBJECTS)
$(mutex_torture_posix_LDADD) $(LIBS)
+rtdm$(EXEEXT): $(rtdm_OBJECTS) $(rtdm_DEPENDENCIES)
+ @rm -f rtdm$(EXEEXT)
+ $(rtdm_LINK) $(rtdm_OBJECTS) $(rtdm_LDADD) $(LIBS)
wakeup-time$(EXEEXT): $(wakeup_time_OBJECTS) $(wakeup_time_DEPENDENCIES)
@rm -f wakeup-time$(EXEEXT)
$(wakeup_time_LINK) $(wakeup_time_OBJECTS) $(wakeup_time_LDADD) $(LIBS)
@@ -473,6 +496,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/cond_torture_posix-cond-torture...@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/mutex_torture_native-mutex-torture...@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/mutex_torture_posix-mutex-torture...@am__quote@
+...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/rtdm-rtdm...@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/wakeup_time-wakeup-time...@am__quote@
.c.o:
@@ -594,6 +618,20 @@ mutex_torture_posix-mutex-torture.obj: mutex-torture.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(mutex_torture_posix_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
mutex_torture_posix-mutex-torture.obj `if test -f 'mutex-torture.c'; then
$(CYGPATH_W) 'mutex-torture.c'; else $(CYGPATH_W) '$(srcdir)/mutex-torture.c';
fi`
+rtdm-rtdm.o: rtdm.c
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rtdm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rtdm-rtdm.o -MD -MP -MF
$(DEPDIR)/rtdm-rtdm.Tpo -c -o rtdm-rtdm.o `test -f 'rtdm.c' || echo
'$(srcdir)/'`rtdm.c
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/rtdm-rtdm.Tpo
$(DEPDIR)/rtdm-rtdm.Po
+...@amdep_true@@am__fastdepCC_FALSE@ source='rtdm.c' object='rtdm-rtdm.o'
libtool=no @AMDEPBACKSLASH@
+...@amdep_true@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rtdm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rtdm-rtdm.o `test -f
'rtdm.c' || echo '$(srcdir)/'`rtdm.c
+
+rtdm-rtdm.obj: rtdm.c
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rtdm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rtdm-rtdm.obj -MD -MP
-MF $(DEPDIR)/rtdm-rtdm.Tpo -c -o rtdm-rtdm.obj `if test -f 'rtdm.c'; then
$(CYGPATH_W) 'rtdm.c'; else $(CYGPATH_W) '$(srcdir)/rtdm.c'; fi`
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/rtdm-rtdm.Tpo
$(DEPDIR)/rtdm-rtdm.Po
+...@amdep_true@@am__fastdepCC_FALSE@ source='rtdm.c' object='rtdm-rtdm.obj'
libtool=no @AMDEPBACKSLASH@
+...@amdep_true@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(rtdm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rtdm-rtdm.obj `if
test -f 'rtdm.c'; then $(CYGPATH_W) 'rtdm.c'; else $(CYGPATH_W)
'$(srcdir)/rtdm.c'; fi`
+
wakeup_time-wakeup-time.o: wakeup-time.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(wakeup_time_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
wakeup_time-wakeup-time.o -MD -MP -MF $(DEPDIR)/wakeup_time-wakeup-time.Tpo -c
-o wakeup_time-wakeup-time.o `test -f 'wakeup-time.c' || echo
'$(srcdir)/'`wakeup-time.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wakeup_time-wakeup-time.Tpo
$(DEPDIR)/wakeup_time-wakeup-time.Po
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
