bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow non-standard RTAI include dir

This commit is contained in:
Bjarne von Horn 2024-02-16 14:05:58 +01:00
parent 251bb4a147
commit e8213ea7e8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -688,7 +688,7 @@ AC_MSG_CHECKING([for RTAI path])
if test -z "${rtaidir}"; then if test -z "${rtaidir}"; then
AC_MSG_RESULT([not specified.]) AC_MSG_RESULT([not specified.])
else else
if test \! -r ${rtaidir}/include/rtai.h; then if test \! -x ${rtaidir}/bin/rtai-config; then
AC_MSG_ERROR([no RTAI installation found in ${rtaidir}!]) AC_MSG_ERROR([no RTAI installation found in ${rtaidir}!])
fi fi
AC_MSG_RESULT([$rtaidir]) AC_MSG_RESULT([$rtaidir])
@ -696,6 +696,7 @@ else
rtai_lxrt_cflags=`$rtaidir/bin/rtai-config --lxrt-cflags` rtai_lxrt_cflags=`$rtaidir/bin/rtai-config --lxrt-cflags`
rtai_lxrt_ldflags=`$rtaidir/bin/rtai-config --lxrt-ldflags` rtai_lxrt_ldflags=`$rtaidir/bin/rtai-config --lxrt-ldflags`
rtai_module_dir=`$rtaidir/bin/rtai-config --module-dir` rtai_module_dir=`$rtaidir/bin/rtai-config --module-dir`
rtai_kernel_cflags=`$rtaidir/bin/rtai-config --kernel-cflags`
fi fi
AC_SUBST(RTAI_DIR,[$rtaidir]) AC_SUBST(RTAI_DIR,[$rtaidir])
@ -705,6 +706,7 @@ AC_SUBST(ENABLE_RTAI,[$rtai])
AC_SUBST(RTAI_LXRT_CFLAGS,[$rtai_lxrt_cflags]) AC_SUBST(RTAI_LXRT_CFLAGS,[$rtai_lxrt_cflags])
AC_SUBST(RTAI_LXRT_LDFLAGS,[$rtai_lxrt_ldflags]) AC_SUBST(RTAI_LXRT_LDFLAGS,[$rtai_lxrt_ldflags])
AC_SUBST(RTAI_MODULE_DIR,[$rtai_module_dir]) AC_SUBST(RTAI_MODULE_DIR,[$rtai_module_dir])
AC_SUBST(RTAI_KERNEL_CFLAGS,[$rtai_kernel_cflags])
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Xenomai path (optional) # Xenomai path (optional)

2
examples/dc_rtai/Kbuild.in
View File

@ -30,7 +30,7 @@ obj-m := ec_dc_rtai_sample.o
ec_dc_rtai_sample-objs := dc_rtai_sample.o ec_dc_rtai_sample-objs := dc_rtai_sample.o
EXTRA_CFLAGS := -I@RTAI_DIR@/include EXTRA_CFLAGS := @RTAI_KERNEL_CFLAGS@
KBUILD_EXTRA_SYMBOLS := \ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \ @abs_top_builddir@/$(LINUX_SYMVERS) \

2
examples/rtai/Kbuild.in
View File

@ -30,7 +30,7 @@ obj-m := ec_rtai_sample.o
ec_rtai_sample-objs := rtai_sample.o ec_rtai_sample-objs := rtai_sample.o
EXTRA_CFLAGS := -I@RTAI_DIR@/include EXTRA_CFLAGS := @RTAI_KERNEL_CFLAGS@
KBUILD_EXTRA_SYMBOLS := \ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \ @abs_top_builddir@/$(LINUX_SYMVERS) \

4
master/Kbuild.in
View File

@ -90,8 +90,8 @@ CFLAGS_rtdm-ioctl.o := @XENOMAI_RTDM_CFLAGS@
endif endif
ifeq (@ENABLE_RTAI@, 1) ifeq (@ENABLE_RTAI@, 1)
CFLAGS_rtdm.o := -I@RTAI_DIR@/include CFLAGS_rtdm.o := @RTAI_KERNEL_CFLAGS@
CFLAGS_rtdm-ioctl.o := -I@RTAI_DIR@/include CFLAGS_rtdm-ioctl.o := @RTAI_KERNEL_CFLAGS@
endif endif
ec_master-objs += rtdm-ioctl.o ec_master-objs += rtdm-ioctl.o