[Emc-commit] rtapi Makefile.inc,1.5,1.6 configure,1.4,1.5

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv15521

Modified Files:
	Makefile.inc configure 
Log Message:
tweaked the adeos mods in configure script

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/emc/rtapi/Makefile.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.inc	23 Jul 2003 01:22:49 -0000	1.5
--- Makefile.inc	25 Jul 2003 01:40:38 -0000	1.6
***************
*** 18,22 ****
  # Makefile add-ons from rtai.mk
  
! RTFLAGS = -Wall -I$(INC_DIR) -I$(RTDIR)/include -O2 -ffast-math -D__KERNEL__ -DMODULE
  ULFLAGS = -Wall -g -I$(INC_DIR) -I$(RTDIR)/include
  RTLINK = ld -r -static
--- 18,22 ----
  # Makefile add-ons from rtai.mk
  
! RTFLAGS = -Wall $(KERNEL_INC) -I$(INC_DIR) -I$(RTDIR)/include -O2 -ffast-math -D__KERNEL__ -DMODULE
  ULFLAGS = -Wall -g -I$(INC_DIR) -I$(RTDIR)/include
  RTLINK = ld -r -static

Index: configure
===================================================================
RCS file: /cvsroot/emc/rtapi/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	23 Jul 2003 01:22:49 -0000	1.4
--- configure	25 Jul 2003 01:40:38 -0000	1.5
***************
*** 22,31 ****
  echo MOD_DIR = /lib/modules/$version/misc >> Makefile.inc
  
- if [ -d /lib/modules/$version/build ] ; then
-     # We have a 2.4 or later kernel if this symlink exists,
-     # so add an include to the correct headers for the kernel running.
-     echo KERNEL_INC = -I/lib/modules/$version/build/include >> Makefile.inc
- fi
- 
  echo CC = gcc >> Makefile.inc
  echo CFLAGS = -g -Wall -I\$\(INC_DIR\) >> Makefile.inc
--- 22,25 ----
***************
*** 94,103 ****
  # ditto for an RTAI boot by looking through the kernel for telltale symbols:
  # set_rtai_callback, remove_rtai_callback for 2.2, 2.4 kernels
! RTAIBOOT=$(/sbin/ksyms -a | grep -E '(_rtai_|_adeos_)' | wc -l)
  if [ $RTAIBOOT -gt 0 ] ; then
      echo found RTAI installed in the kernel
  fi
  
! # append stuff into Makefile.inc only if we have found the RTL dir 
  # and have booted it
  if [ "$RTLDIR" != "" -a $RTLBOOT -gt 0 ] ; then
--- 88,104 ----
  # ditto for an RTAI boot by looking through the kernel for telltale symbols:
  # set_rtai_callback, remove_rtai_callback for 2.2, 2.4 kernels
! RTAIBOOT=$(/sbin/ksyms -a | grep _rtai_ | wc -l)
  if [ $RTAIBOOT -gt 0 ] ; then
      echo found RTAI installed in the kernel
  fi
  
! # ditto for an ADEOS boot by looking through the kernel for telltale symbols:
! # ???_adeos_????, ????_adeos_????
! ADEOSBOOT=$(/sbin/ksyms -a | grep _adeos_ | wc -l)
! if [ $ADEOSBOOT -gt 0 ] ; then
!     echo found ADEOS installed in the kernel
! fi
! 
! # append stuff into Makefile.inc only if we have found the RTL dir
  # and have booted it
  if [ "$RTLDIR" != "" -a $RTLBOOT -gt 0 ] ; then
***************
*** 149,152 ****
--- 150,162 ----
      rm -f configure.tmp
      # end of JK hack
+ 
+     # Paul added this at the top to make adeos RTAI work, but it causes warnings
+     # when compiling rtai_rtapi.c for "regular" rtai. (BDI-TNG)
+ 	# So I moved it down here and only do it if adeos is present - jmkasunich
+     if [ -d /lib/modules/$version/build -a $ADEOSBOOT -gt 0 ] ; then
+         # We have a 2.4 or later kernel if this symlink exists,
+         # so add an include to the correct headers for the kernel running.
+         echo KERNEL_INC = -I/lib/modules/$version/build/include >> Makefile.inc
+     fi
  
      # leave when we configured one