[Armadeus-commitlog] SF.net SVN: armadeus:[1192] trunk/target/demos/real_time
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1192] trunk/target/demos/real_time
|
From: <gwe...@us...> - 2009-03-27 15:41:41
|
Revision: 1192
http://armadeus.svn.sourceforge.net/armadeus/?rev=1192&view=rev
Author: gwenhael
Date: 2009-03-27 15:41:24 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
[DEMOS] Xenomai examples : Makefile now uses relative path
Modified Paths:
--------------
trunk/target/demos/real_time/Makefile.in
trunk/target/demos/real_time/interrupt/linux/kernel/Makefile
trunk/target/demos/real_time/interrupt/linux/kernel/interrupt_linux_kernel.c
trunk/target/demos/real_time/interrupt/linux/user_space/Makefile
trunk/target/demos/real_time/interrupt/xenomai/kernel/Makefile
trunk/target/demos/real_time/interrupt/xenomai/user_space/Makefile
trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/Makefile
trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/pulse_linux_kernel_sleep.c
trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/Makefile
trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/pulse_linux_kernel_timer.c
trunk/target/demos/real_time/pulse/linux/user_space/sleep/Makefile
trunk/target/demos/real_time/pulse/linux/user_space/timer/Makefile
trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/Makefile
trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/Makefile
trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/pulse_xeno_kernel_timer.c
trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/Makefile
trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_timer/Makefile
Modified: trunk/target/demos/real_time/Makefile.in
===================================================================
--- trunk/target/demos/real_time/Makefile.in 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/Makefile.in 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,6 +1,5 @@
###### CONFIGURATION ######
DEST_DIR=/tftpboot/local/bin
-ARMADEUS_BASE_DIR=/home/gwe/armadeus/armadeus/
include $(ARMADEUS_BASE_DIR)/Makefile.in
@@ -15,8 +14,9 @@
EXEC=$(APPLICATIONS)
+XENO=$(ARMADEUS_ROOTFS_DIR)/usr/xenomai
+XENOCONFIG=$(shell PATH=$(XENO):$(XENO)/bin:$(PATH) which xeno-config 2>/dev/null)
-
ifneq ($(APPLICATIONS),)
SRC= $(wildcard *.c)
OBJ= $(SRC:.c=.o)
@@ -39,7 +39,7 @@
CLEANMOD := ${patsubst %, .%*, $(MODULES)}
PWD := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
obj-m := $(OBJ)
-EXTRA_CFLAGS=-I$(KSRC)/include/xenomai -I$(KSRC)/include/xenomai/posix -I$(KSRC)/arch/arm/mach-imx/include/mach/
+
CLEAN_MOD= modules.order *.ko *.mod.c *.mod.o *.symvers $(CLEANMOD) .tmp_versions
$(EXEC):
$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
Modified: trunk/target/demos/real_time/interrupt/linux/kernel/Makefile
===================================================================
--- trunk/target/demos/real_time/interrupt/linux/kernel/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/interrupt/linux/kernel/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,4 +1,9 @@
###### CONFIGURATION ######
MODULES=interrupt_linux_kernel
-
--include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+ifneq ($(KERNELRELEASE),)
+ obj-m := $(MODULES).o
+ EXTRA_CFLAGS=-I./include/xenomai -I./include/xenomai/posix -I./include/xenomai/native
+else
+ARMADEUS_BASE_DIR=../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
Modified: trunk/target/demos/real_time/interrupt/linux/kernel/interrupt_linux_kernel.c
===================================================================
--- trunk/target/demos/real_time/interrupt/linux/kernel/interrupt_linux_kernel.c 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/interrupt/linux/kernel/interrupt_linux_kernel.c 2009-03-27 15:41:24 UTC (rev 1192)
@@ -27,7 +27,7 @@
#include <asm/signal.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <gpio.h>
+#include <asm/gpio.h>
#define IRQ_NB IRQ_GPIOA(6)
Modified: trunk/target/demos/real_time/interrupt/linux/user_space/Makefile
===================================================================
--- trunk/target/demos/real_time/interrupt/linux/user_space/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/interrupt/linux/user_space/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,4 +1,4 @@
###### CONFIGURATION ######
-APPLICATIONS=irq_linux_us
-
-include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+APPLICATIONS=interrupt_linux_us
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
Modified: trunk/target/demos/real_time/interrupt/xenomai/kernel/Makefile
===================================================================
--- trunk/target/demos/real_time/interrupt/xenomai/kernel/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/interrupt/xenomai/kernel/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,4 +1,10 @@
### List of modules to be build
MODULES= interrupt_xeno_kernel
-include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
\ No newline at end of file
+ifneq ($(KERNELRELEASE),)
+ EXTRA_CFLAGS := -I./include/xenomai -I./include/xenomai/posix -I./include/xenomai/native
+ obj-m := $(MODULES).o
+else
+ ARMADEUS_BASE_DIR=../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
Modified: trunk/target/demos/real_time/interrupt/xenomai/user_space/Makefile
===================================================================
--- trunk/target/demos/real_time/interrupt/xenomai/user_space/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/interrupt/xenomai/user_space/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,5 +1,6 @@
### List of applications to be build
APPLICATIONS = interrupt_xeno_userspace
### Set of compilation instructions
-include ../../../Makefile.in
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
Modified: trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,3 +1,9 @@
###### CONFIGURATION ######
MODULES=pulse_linux_kernel_sleep
--include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+
+ifneq ($(KERNELRELEASE),)
+ obj-m := $(MODULES).o
+else
+ ARMADEUS_BASE_DIR=../../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
Modified: trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/pulse_linux_kernel_sleep.c
===================================================================
--- trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/pulse_linux_kernel_sleep.c 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/kernel/sleep_kernel/pulse_linux_kernel_sleep.c 2009-03-27 15:41:24 UTC (rev 1192)
@@ -27,7 +27,7 @@
#include <linux/kthread.h>
#include <linux/delay.h>
#include <linux/timer.h>
-#include <gpio.h>
+#include <asm/gpio.h>
#define TIMESLEEP 10
#define MINOR_PORT 4
Modified: trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,3 +1,9 @@
###### CONFIGURATION ######
MODULES=pulse_linux_kernel_timer
--include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+ifneq ($(KERNELRELEASE),)
+ obj-m := $(MODULES).o
+else
+ ARMADEUS_BASE_DIR=../../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
+
Modified: trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/pulse_linux_kernel_timer.c
===================================================================
--- trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/pulse_linux_kernel_timer.c 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/kernel/timer_kernel/pulse_linux_kernel_timer.c 2009-03-27 15:41:24 UTC (rev 1192)
@@ -28,7 +28,7 @@
#include <linux/kthread.h>
#include <linux/delay.h>
#include <linux/timer.h>
-#include <gpio.h>
+#include <asm/gpio.h>
#define TIMESLEEP HZ/100
#define MINOR_PORT 4
Modified: trunk/target/demos/real_time/pulse/linux/user_space/sleep/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/linux/user_space/sleep/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/user_space/sleep/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,3 +1,3 @@
APPLICATIONS=pulse_linux_userspace_sleep
-
-include ../../../../Makefile.in
+ARMADEUS_BASE_DIR=../../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
Modified: trunk/target/demos/real_time/pulse/linux/user_space/timer/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/linux/user_space/timer/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/linux/user_space/timer/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,3 +1,4 @@
APPLICATIONS=pulse_linux_userspace_timer
-include ../../../../Makefile.in
+ARMADEUS_BASE_DIR=../../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
Modified: trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,4 +1,10 @@
### List of modules to be build
MODULES = pulse_xeno_kernel_rt_timer
-include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+ifneq ($(KERNELRELEASE),)
+ EXTRA_CFLAGS := -I./include/xenomai -I./include/xenomai/posix -I./include/xenomai/native
+ obj-m := $(MODULES).o
+else
+ ARMADEUS_BASE_DIR=../../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
Modified: trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c 2009-03-27 15:41:24 UTC (rev 1192)
@@ -27,7 +27,7 @@
#include <native/sem.h>
#include <mach/hardware.h>
#include <nucleus/types.h>
-#include <gpio.h>
+#include <asm/gpio.h>
MODULE_LICENSE("GPL");
Modified: trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,3 +1,10 @@
### List of modules to be build
MODULES = pulse_xeno_kernel_timer
-include /home/gwe/armadeus/armadeus/target/demos/real_time/Makefile.in
+
+ifneq ($(KERNELRELEASE),)
+ EXTRA_CFLAGS := -I./include/xenomai -I./include/xenomai/posix -I./include/xenomai/native
+ obj-m := $(MODULES).o
+else
+ ARMADEUS_BASE_DIR=../../../../../../..
+ include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
+endif
Modified: trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/pulse_xeno_kernel_timer.c
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/pulse_xeno_kernel_timer.c 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/kernel/timer_kernel/pulse_xeno_kernel_timer.c 2009-03-27 15:41:24 UTC (rev 1192)
@@ -27,7 +27,7 @@
#include <native/timer.h>
#include <rtdm/rtdm_driver.h>
#include <mach/hardware.h>
-#include <gpio.h>
+#include <asm/gpio.h>
MODULE_LICENSE("GPL");
Modified: trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,5 +1,5 @@
### List of applications to be build
APPLICATIONS = pulse_xeno_userspace_timer
+ARMADEUS_BASE_DIR=../../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
-include ../../../../Makefile.in
-
Modified: trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_timer/Makefile
===================================================================
--- trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_timer/Makefile 2009-03-27 10:45:57 UTC (rev 1191)
+++ trunk/target/demos/real_time/pulse/xenomai/user_space/pulse_timer/Makefile 2009-03-27 15:41:24 UTC (rev 1192)
@@ -1,5 +1,5 @@
### List of applications to be build
APPLICATIONS = pulse_xeno_userspace_timer
+ARMADEUS_BASE_DIR=../../../../../../..
+include $(ARMADEUS_BASE_DIR)/target/demos/real_time/Makefile.in
-include ../../../../Makefile.in
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
