Module: xenomai-3
Branch: master
Commit: 8ea8df3cd21dc22e6355b7085d6074c54fc66c76
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=8ea8df3cd21dc22e6355b7085d6074c54fc66c76

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon Sep 14 10:13:35 2015 +0200

demo/posix: move can-rtt demo to the Cobalt-specific area

---

 demo/posix/Makefile.am            |   21 +--------------------
 demo/posix/cobalt/Makefile.am     |    8 +++++++-
 demo/posix/{ => cobalt}/can-rtt.c |    6 ------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/demo/posix/Makefile.am b/demo/posix/Makefile.am
index 613ebf6..aa0f7f7 100644
--- a/demo/posix/Makefile.am
+++ b/demo/posix/Makefile.am
@@ -1,25 +1,6 @@
-demodir = @XENO_DEMO_DIR@
-
-CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
 
 if XENO_COBALT
 SUBDIRS = cobalt
 endif
 
-demo_PROGRAMS = can-rtt
-
-cppflags =                     \
-       $(XENO_USER_CFLAGS)     \
-       -I$(top_srcdir)/include
-
-ldflags = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS)
-
-ldadd =                                        \
-       ../../lib/@XENO_CORE_LIB@               \
-        @XENO_USER_LDADD@                      \
-       -lpthread -lrt
-
-can_rtt_SOURCES = can-rtt.c
-can_rtt_CPPFLAGS = $(cppflags)
-can_rtt_LDFLAGS = $(ldflags)
-can_rtt_LDADD = $(ldadd)
+DIST_SUBDIRS = cobalt
diff --git a/demo/posix/cobalt/Makefile.am b/demo/posix/cobalt/Makefile.am
index 2eec916..cb854f3 100644
--- a/demo/posix/cobalt/Makefile.am
+++ b/demo/posix/cobalt/Makefile.am
@@ -9,7 +9,8 @@ demo_PROGRAMS =         \
        iddp-sendrecv   \
        xddp-echo       \
        xddp-label      \
-       xddp-stream
+       xddp-stream     \
+       can_rtt
 
 cppflags =                     \
        $(XENO_USER_CFLAGS)     \
@@ -56,3 +57,8 @@ xddp_stream_SOURCES = xddp-stream.c
 xddp_stream_CPPFLAGS = $(cppflags)
 xddp_stream_LDFLAGS = $(ldflags)
 xddp_stream_LDADD = $(ldadd)
+
+can_rtt_SOURCES = can-rtt.c
+can_rtt_CPPFLAGS = $(cppflags)
+can_rtt_LDFLAGS = $(ldflags)
+can_rtt_LDADD = $(ldadd)
diff --git a/demo/posix/can-rtt.c b/demo/posix/cobalt/can-rtt.c
similarity index 99%
rename from demo/posix/can-rtt.c
rename to demo/posix/cobalt/can-rtt.c
index 36cdfbc..61cad05 100644
--- a/demo/posix/can-rtt.c
+++ b/demo/posix/cobalt/can-rtt.c
@@ -48,13 +48,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-
-#ifdef CONFIG_XENO_COBALT
 #include <rtdm/can.h>
-#else
-#include <linux/can.h>
-#include <linux/can/raw.h>
-#endif
 #include <xenomai/init.h>
 
 #define NSEC_PER_SEC 1000000000


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

Reply via email to