RTLINUX_DIR variable was used inconsistently (different meaning inside
rtlinux tree compared to the general meaning in the OCERA tree).
Solution adopted, to maintain compatibility toward external developers,
the particular rtlinux meaning of the variable has been isolated in the
rtlinux tree and, more important, has been adopted a different variable
RTL_DIR that has the same meaning both inside and outside the rtlinux
tree.
# xxx_SOURCES .. list of specific target sources
#
# LINUX_DIR .. location of Linux kernel sources
# xxx_SOURCES .. list of specific target sources
#
# LINUX_DIR .. location of Linux kernel sources
-# RTLINUX_DIR .. location of RT-Linux sources
+# RTL_DIR .. location of RT-Linux sources
# Hack to check RT-Linux rules
#LINUX_DIR := /home/cvs/ocera/ocera-build/kernel/linux
# Hack to check RT-Linux rules
#LINUX_DIR := /home/cvs/ocera/ocera-build/kernel/linux
-#RTLINUX_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux
+#RTL_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux
OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../../.. ; pwd -L ) )
# We need to ensure definition of sources directory first
OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../../.. ; pwd -L ) )
# We need to ensure definition of sources directory first
USER_BIN_DIR := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/bin
USER_BUILD_DIR := $(OCERA_DIR)/$(BUILD_DIR_NAME)/user/orte
LINUX_DIR := $(OCERA_DIR)/kernel/linux
USER_BIN_DIR := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/bin
USER_BUILD_DIR := $(OCERA_DIR)/$(BUILD_DIR_NAME)/user/orte
LINUX_DIR := $(OCERA_DIR)/kernel/linux
-#RTLINUX_DIR := $(OCERA_DIR)/kernel/rtlinux
+#RTL_DIR := $(OCERA_DIR)/kernel/rtlinux
CONFIG_FILE := $(OCERA_DIR)/emdebsys/.config
else
KERN_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include-kern
CONFIG_FILE := $(OCERA_DIR)/emdebsys/.config
else
KERN_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include-kern
-export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTLINUX_DIR
+export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTL_DIR
$(KERN_MODULES_DIR)/kernel.mk: $(LINUX_DIR)/.config $(MAKERULES_DIR)/kernelcfg2mk
$(MAKERULES_DIR)/kernelcfg2mk $(LINUX_DIR) $(KERN_MODULES_DIR)
$(KERN_MODULES_DIR)/kernel.mk: $(LINUX_DIR)/.config $(MAKERULES_DIR)/kernelcfg2mk
$(MAKERULES_DIR)/kernelcfg2mk $(LINUX_DIR) $(KERN_MODULES_DIR)
-ifdef RTLINUX_DIR
-include $(RTLINUX_DIR)/rtl.mk
+ifdef RTL_DIR
+include $(RTL_DIR)/rtl.mk
KERN_CC = $(CC)
INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
KERN_CC = $(CC)
INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
KERN_ARCH = $(ARCH)
KERN_LD = ld -m elf_$(KERN_ARCH)
KERN_ARCH = $(ARCH)
KERN_LD = ld -m elf_$(KERN_ARCH)
include $(KERN_MODULES_DIR)/kernel.mk
include $(KERN_MODULES_DIR)/kernel.mk
kernel-pass-local: $(rtlinux_MODULES:%=$(KERN_MODULES_DIR)/%$(KERN_EXE_SUFFIX))
kernel-pass-local: $(rtlinux_MODULES:%=$(KERN_MODULES_DIR)/%$(KERN_EXE_SUFFIX))
AC_ARG_WITH([rtlinuxdir],
[AC_HELP_STRING([--with-rtlinuxdir=DIR],
[specify path to RTLinux source directory])],
AC_ARG_WITH([rtlinuxdir],
[AC_HELP_STRING([--with-rtlinuxdir=DIR],
[specify path to RTLinux source directory])],
- [RTLINUX_DIR="${withval}"],
- [RTLINUX_DIR=/usr/src/rtlinux])
+ [RTL_DIR="${withval}"],
+ [RTL_DIR=/usr/src/rtlinux])
DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
if test "${CONFIG_RTLINUX}" != "no" ; then
DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
if test "${CONFIG_RTLINUX}" != "no" ; then
- AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
- if [[ -d ${RTLINUX_DIR}/include ]] ; then
- RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+ AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk])
+ if [[ -d ${RTL_DIR}/include ]] ; then
+ RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
else
AC_MSG_ERROR([incorrect RTLinux directory?])
fi
else
AC_MSG_ERROR([incorrect RTLinux directory?])
fi
AC_ARG_WITH([rtlinuxdir],
[AC_HELP_STRING([--with-rtlinuxdir=DIR],
[specify path to RTLinux source directory])],
AC_ARG_WITH([rtlinuxdir],
[AC_HELP_STRING([--with-rtlinuxdir=DIR],
[specify path to RTLinux source directory])],
- [RTLINUX_DIR="${withval}"],
- [RTLINUX_DIR=/usr/src/rtlinux])
+ [RTL_DIR="${withval}"],
+ [RTL_DIR=/usr/src/rtlinux])
DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
if test "${CONFIG_RTLINUX}" != "no" ; then
DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
if test "${CONFIG_RTLINUX}" != "no" ; then
- AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
- if [[ -d ${RTLINUX_DIR}/include ]] ; then
- RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+ AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk])
+ if [[ -d ${RTL_DIR}/include ]] ; then
+ RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
else
AC_MSG_ERROR([incorrect RTLinux directory?])
fi
else
AC_MSG_ERROR([incorrect RTLinux directory?])
fi
# Check whether --with-rtlinuxdir or --without-rtlinuxdir was given.
if test "${with_rtlinuxdir+set}" = set; then
withval="$with_rtlinuxdir"
# Check whether --with-rtlinuxdir or --without-rtlinuxdir was given.
if test "${with_rtlinuxdir+set}" = set; then
withval="$with_rtlinuxdir"
- RTLINUX_DIR="${withval}"
- RTLINUX_DIR=/usr/src/rtlinux
+ RTL_DIR=/usr/src/rtlinux
if test "${CONFIG_RTLINUX}" != "no" ; then
if test "${CONFIG_RTLINUX}" != "no" ; then
- echo "$as_me:$LINENO: checking RTLinux directory ${RTLINUX_DIR} for rtl.mk" >&5
-echo $ECHO_N "checking RTLinux directory ${RTLINUX_DIR} for rtl.mk... $ECHO_C" >&6
- if [ -d ${RTLINUX_DIR}/include ] ; then
- RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+ echo "$as_me:$LINENO: checking RTLinux directory ${RTL_DIR} for rtl.mk" >&5
+echo $ECHO_N "checking RTLinux directory ${RTL_DIR} for rtl.mk... $ECHO_C" >&6
+ if [ -d ${RTL_DIR}/include ] ; then
+ RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
else
{ { echo "$as_me:$LINENO: error: incorrect RTLinux directory?" >&5
echo "$as_me: error: incorrect RTLinux directory?" >&2;}
else
{ { echo "$as_me:$LINENO: error: incorrect RTLinux directory?" >&5
echo "$as_me: error: incorrect RTLinux directory?" >&2;}