Module: xenomai-forge
Branch: next
Commit: b894f1df1d1cefa1c9fba44355838ad4ec65f23c
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=b894f1df1d1cefa1c9fba44355838ad4ec65f23c

Author: Philippe Gerum <r...@xenomai.org>
Date:   Fri May 16 15:46:13 2014 +0200

bootstrap

---

 lib/cobalt/Makefile.in                 |   12 +++++++++++-
 testsuite/latency/Makefile.in          |    9 +++------
 testsuite/regression/posix/Makefile.in |   17 +++++++++++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/cobalt/Makefile.in b/lib/cobalt/Makefile.in
index 18f9fb8..8b3702a 100644
--- a/lib/cobalt/Makefile.in
+++ b/lib/cobalt/Makefile.in
@@ -139,7 +139,8 @@ am_libcobalt_la_OBJECTS = libcobalt_la-assert_context.lo \
        libcobalt_la-semaphore.lo libcobalt_la-signal.lo \
        libcobalt_la-sigshadow.lo libcobalt_la-thread.lo \
        libcobalt_la-ticks.lo libcobalt_la-timer.lo \
-       libcobalt_la-trace.lo libcobalt_la-wrappers.lo
+       libcobalt_la-timerfd.lo libcobalt_la-trace.lo \
+       libcobalt_la-wrappers.lo
 libcobalt_la_OBJECTS = $(am_libcobalt_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -456,6 +457,7 @@ libcobalt_la_SOURCES = \
        thread.c                \
        ticks.c                 \
        timer.c                 \
+       timerfd.c               \
        trace.c                 \
        wrappers.c
 
@@ -564,6 +566,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-thread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-ticks.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-timer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-timerfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-trace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libcobalt_la-wrappers.Plo@am__quote@
 
@@ -721,6 +724,13 @@ libcobalt_la-timer.lo: timer.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(libcobalt_la_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS) -c -o libcobalt_la-timer.lo `test -f 'timer.c' || echo 
'$(srcdir)/'`timer.c
 
+libcobalt_la-timerfd.lo: timerfd.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(libcobalt_la_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS) -MT libcobalt_la-timerfd.lo -MD -MP -MF 
$(DEPDIR)/libcobalt_la-timerfd.Tpo -c -o libcobalt_la-timerfd.lo `test -f 
'timerfd.c' || echo '$(srcdir)/'`timerfd.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcobalt_la-timerfd.Tpo 
$(DEPDIR)/libcobalt_la-timerfd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='timerfd.c' 
object='libcobalt_la-timerfd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(libcobalt_la_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS) -c -o libcobalt_la-timerfd.lo `test -f 'timerfd.c' || 
echo '$(srcdir)/'`timerfd.c
+
 libcobalt_la-trace.lo: trace.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC 
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) 
$(DEFAULT_INCLUDES) $(INCLUDES) $(libcobalt_la_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS) -MT libcobalt_la-trace.lo -MD -MP -MF 
$(DEPDIR)/libcobalt_la-trace.Tpo -c -o libcobalt_la-trace.lo `test -f 'trace.c' 
|| echo '$(srcdir)/'`trace.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libcobalt_la-trace.Tpo 
$(DEPDIR)/libcobalt_la-trace.Plo
diff --git a/testsuite/latency/Makefile.in b/testsuite/latency/Makefile.in
index 4439c7e..834c80c 100644
--- a/testsuite/latency/Makefile.in
+++ b/testsuite/latency/Makefile.in
@@ -103,8 +103,7 @@ am__installdirs = "$(DESTDIR)$(testdir)"
 PROGRAMS = $(test_PROGRAMS)
 am_latency_OBJECTS = latency-latency.$(OBJEXT)
 latency_OBJECTS = $(am_latency_OBJECTS)
-latency_DEPENDENCIES = ../../lib/alchemy/libalchemy.la \
-       ../../lib/copperplate/libcopperplate.la $(core_libs)
+latency_DEPENDENCIES = $(core_libs)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -138,7 +137,6 @@ AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
-CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -345,16 +343,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 testdir = @XENO_TEST_DIR@
+CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
 latency_SOURCES = latency.c
 latency_CPPFLAGS = \
        $(XENO_USER_CFLAGS)                             \
        -I$(top_srcdir)/include
 
-latency_LDFLAGS = 
+latency_LDFLAGS = $(XENO_POSIX_WRAPPERS)
 core_libs = $(am__append_1)
 latency_LDADD = \
-       ../../lib/alchemy/libalchemy.la         \
-       ../../lib/copperplate/libcopperplate.la \
        $(core_libs)                            \
         @XENO_USER_LDADD@                      \
        -lpthread -lrt -lm
diff --git a/testsuite/regression/posix/Makefile.in 
b/testsuite/regression/posix/Makefile.in
index 132b723..b34a792 100644
--- a/testsuite/regression/posix/Makefile.in
+++ b/testsuite/regression/posix/Makefile.in
@@ -80,7 +80,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-test_PROGRAMS = leaks$(EXEEXT) mq_select$(EXEEXT)
+test_PROGRAMS = leaks$(EXEEXT) mq_select$(EXEEXT) timerfd$(EXEEXT)
 subdir = testsuite/regression/posix
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/config/depcomp $(noinst_HEADERS)
@@ -113,6 +113,10 @@ mq_select_SOURCES = mq_select.c
 mq_select_OBJECTS = mq_select.$(OBJEXT)
 mq_select_LDADD = $(LDADD)
 mq_select_DEPENDENCIES = ../../../lib/cobalt/libcobalt.la
+timerfd_SOURCES = timerfd.c
+timerfd_OBJECTS = timerfd.$(OBJEXT)
+timerfd_LDADD = $(LDADD)
+timerfd_DEPENDENCIES = ../../../lib/cobalt/libcobalt.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -146,8 +150,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = leaks.c mq_select.c
-DIST_SOURCES = leaks.c mq_select.c
+SOURCES = leaks.c mq_select.c timerfd.c
+DIST_SOURCES = leaks.c mq_select.c timerfd.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -198,7 +202,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CHECKFLAGS = @CHECKFLAGS@
 CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
-CPPFLAGS = $(XENO_USER_CFLAGS)                                 \
+CPPFLAGS = $(XENO_USER_CFLAGS)                 \
        -I$(top_srcdir)/include
 
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
@@ -447,6 +451,10 @@ mq_select$(EXEEXT): $(mq_select_OBJECTS) 
$(mq_select_DEPENDENCIES) $(EXTRA_mq_se
        @rm -f mq_select$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(mq_select_OBJECTS) $(mq_select_LDADD) $(LIBS)
 
+timerfd$(EXEEXT): $(timerfd_OBJECTS) $(timerfd_DEPENDENCIES) 
$(EXTRA_timerfd_DEPENDENCIES) 
+       @rm -f timerfd$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(timerfd_OBJECTS) $(timerfd_LDADD) $(LIBS)
+
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
 
@@ -455,6 +463,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/leaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mq_select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timerfd.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF 
$(DEPDIR)/$*.Tpo -c -o $@ $<


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to