Changeset b9ca4ba in rtems

Timestamp:

12/01/97 17:07:52 (26 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ba1a2af9

Parents:

f4cec63d

Message:

Even more cleanup to make sure all the --enable/disable options avoid
generating Makefiles where possible.

Added code to make sure make/custom file and bsp directory exist for
configured bsps. This code also accounts for "aliased" BSPs.

Files:

• configure (modified) (25 diffs)
• configure.in (modified) (6 diffs)

configure

@@ -37 +37 @@
 ac_help="$ac_help
 \
-  --disable-tests                   disable tests"
+    --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build"
 ac_help="$ac_help
 \
-    --enable-hwapi                  enable hardware API library"
+  --enable-tests                    enable tests"
 ac_help="$ac_help
 \
-    --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build"
+  --enable-hwapi                 enable hardware API library"
 
 # Initialize some variables set by options.
@@ -1315 +1315 @@
 esac
 
+# Override the set of BSPs to be built.
+# Check whether --enable-rtemsbsp or --disable-rtemsbsp was given.
+if test "${enable_rtemsbsp+set}" = set; then
+  enableval="$enable_rtemsbsp"
+  \
+      rtems_bsp=$enableval \
+
+fi
+
+
 # Is this a supported CPU?
 echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6
-echo "configure:1320: checking if cpu $target_cpu is supported" >&5
+echo "configure:1330: checking if cpu $target_cpu is supported" >&5
 if test -d "$srcdir/c/src/exec/score/cpu/$target_cpu"; then
   echo "$ac_t""yes" 1>&6
@@ -1328 +1338 @@
 
 echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
-echo "configure:1331: checking for Makefile.in in c/src/exec/rtems" >&5
+echo "configure:1341: checking for Makefile.in in c/src/exec/rtems" >&5
 if test -d $srcdir/c/src/exec/rtems; then
   rtems_av_save_dir=`pwd`;
@@ -1342 +1352 @@
 
 
+echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
+echo "configure:1356: checking for Makefile.in in c/src/exec/sapi" >&5
+if test -d $srcdir/c/src/exec/sapi; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find c/src/exec/sapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  makefiles="$makefiles $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  echo "$ac_t""done" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+if test "$RTEMS_HAS_POSIX" = "yes"; then
+  
 echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
-echo "configure:1346: checking for Makefile.in in c/src/exec/posix" >&5
+echo "configure:1373: checking for Makefile.in in c/src/exec/posix" >&5
 if test -d $srcdir/c/src/exec/posix; then
   rtems_av_save_dir=`pwd`;
@@ -1356 +1383 @@
 
 
-
-echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
-echo "configure:1361: checking for Makefile.in in c/src/exec/sapi" >&5
-if test -d $srcdir/c/src/exec/sapi; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find c/src/exec/sapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
-  makefiles="$makefiles $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  echo "$ac_t""done" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-echo $ac_n "checking for Makefile.in in c/src/exec/wrapup""... $ac_c" 1>&6
-echo "configure:1376: checking for Makefile.in in c/src/exec/wrapup" >&5
-if test -d $srcdir/c/src/exec/wrapup; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find c/src/exec/wrapup -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
-  makefiles="$makefiles $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  echo "$ac_t""done" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
+  makefiles="$makefiles c/src/exec/posix/Makefile"
+fi
 
 # find all the Makefiles for the BSPs
@@ -1393 +1392 @@
   if test -z "$rtems_bsp"; then
     echo $ac_n "checking for bsps""... $ac_c" 1>&6
-echo "configure:1396: checking for bsps" >&5
+echo "configure:1395: checking for bsps" >&5
     files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
     for file in $files; do
@@ -1410 +1409 @@
   # collect makefiles for each bsp
   for i in $rtems_bsp; do
-    
-echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$i""... $ac_c" 1>&6
-echo "configure:1415: checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$i" >&5
-if test -d $srcdir/c/src/lib/libbsp/$target_cpu/$i; then
+    # make sure there is a make/custom file for the bsp
+    if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then
+      { echo "configure: error: no make/custom/${i}.cfg file for BSP $i" 1>&2; exit 1; }
+    fi
+
+    # account for "aliased" bsps which share source code
+    case $i in 
+      mvme162lx)    bspdir=mvme162  ;;  # mvme162 board variant
+      gen68360_040) bspdir=gen68360 ;;  # 68360 in companion mode
+      go32_p5)      bspdir=go32     ;;  # go32 on Pentium class CPU
+      p4600)        bspdir=p4000    ;;  # p4000 board with IDT 4600
+      p4650)        bspdir=p4000    ;;  # p4000 board with IDT 4650
+      *)            bspdir=$i;;
+    esac
+
+    # Is there code where there should be for this BSP?
+    if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then
+      RTEMS_BSP="$RTEMS_BSP $i"
+      # make sure the Makefiles in a bsp directory are only done once
+      echo $bspdirs | grep $bspdir >/dev/null 2>&1
+      if test $? -ne 0 ; then
+        bspdirs="$bspdirs $bspdir"
+        
+echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$bspdir""... $ac_c" 1>&6
+echo "configure:1436: checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$bspdir" >&5
+if test -d $srcdir/c/src/lib/libbsp/$target_cpu/$bspdir; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
-  rtems_av_tmp=`find c/src/lib/libbsp/$target_cpu/$i -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
+  rtems_av_tmp=`find c/src/lib/libbsp/$target_cpu/$bspdir -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
   makefiles="$makefiles $rtems_av_tmp";
   cd $rtems_av_save_dir;
@@ -1425 +1446 @@
 
 
+      fi
+    else
+      { echo "configure: error: unable to find libbsp directory ($bspdir) for  $i" 1>&2; exit 1; }
+    fi
   done
 fi
@@ -1431 +1456 @@
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:1434: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
+echo "configure:1459: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
   rtems_av_save_dir=`pwd`;
@@ -1448 +1473 @@
   
 echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:1451: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
+echo "configure:1476: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/start/$target_cpu; then
   rtems_av_save_dir=`pwd`;
@@ -1480 +1505 @@
 
 
-RTEMS_BSP=$rtems_bsp
 RTEMS_HOST=$host_os
 RTEMS_ROOT=`cd $srcdir/c; pwd`
@@ -1493 +1517 @@
 # If the tests are enabled, then find all the test suite Makefiles
 echo $ac_n "checking Are the test suites enabled? ""... $ac_c" 1>&6
-echo "configure:1496: checking Are the test suites enabled? " >&5
+echo "configure:1520: checking Are the test suites enabled? " >&5
+tests_enabled=yes
 # Check whether --enable-tests or --disable-tests was given.
 if test "${enable_tests+set}" = set; then
   enableval="$enable_tests"
   \
-   { echo "configure: error: no" 1>&2; exit 1; }
-else
-  \
-   echo "$ac_t""yes" 1>&6 \
-     
+  case "${enableval}" in
+    yes) echo "$ac_t""yes" 1>&6 ;;
+    no)  echo "$ac_t""no" 1>&6 ; tests_enabled=no ;;
+    *)   { echo "configure: error: bad value ${enableval} for tests option" 1>&2; exit 1; } ;;
+  esac
+else
+  echo "$ac_t""yes" 1>&6
+
+fi
+
+
+if test "$tests_enabled" = "yes"; then
+   
 echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:1507: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:1540: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
 if test -d $srcdir/c/src/tests/tools/$target_cpu; then
   rtems_av_save_dir=`pwd`;
@@ -1516 +1549 @@
 fi
 
- \
-     
+
+   
 echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:1522: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:1555: checking for Makefile.in in c/src/tests/libtests" >&5
 if test -d $srcdir/c/src/tests/libtests; then
   rtems_av_save_dir=`pwd`;
@@ -1531 +1564 @@
 fi
 
- \
-     
+
+   
 echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:1537: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:1570: checking for Makefile.in in c/src/tests/sptests" >&5
 if test -d $srcdir/c/src/tests/sptests; then
   rtems_av_save_dir=`pwd`;
@@ -1546 +1579 @@
 fi
 
- \
-     
+
+   
 echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:1552: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:1585: checking for Makefile.in in c/src/tests/tmtests" >&5
 if test -d $srcdir/c/src/tests/tmtests; then
   rtems_av_save_dir=`pwd`;
@@ -1561 +1594 @@
 fi
 
- \
-     
+
+   
 echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:1567: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:1600: checking for Makefile.in in c/src/tests/mptests" >&5
 if test -d $srcdir/c/src/tests/mptests; then
   rtems_av_save_dir=`pwd`;
@@ -1576 +1609 @@
 fi
 
- \
+
+   if test "$RTEMS_HAS_POSIX" = "yes"; then
      
 echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:1582: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:1616: checking for Makefile.in in c/src/tests/psxtests" >&5
 if test -d $srcdir/c/src/tests/psxtests; then
   rtems_av_save_dir=`pwd`;
@@ -1591 +1625 @@
 fi
 
- \
-
-fi
-
+
+   fi
+fi 
 
 # If the HWAPI is enabled, the find the HWAPI Makefiles
 echo $ac_n "checking Is the HWAPI enabled? ""... $ac_c" 1>&6
-echo "configure:1601: checking Is the HWAPI enabled? " >&5
+echo "configure:1634: checking Is the HWAPI enabled? " >&5
 # Check whether --enable-hwapi or --disable-hwapi was given.
 if test "${enable_hwapi+set}" = set; then
   enableval="$enable_hwapi"
   \
-      echo "$ac_t""yes" 1>&6 \
-        
+  case "${enableval}" in
+    yes) echo "$ac_t""yes" 1>&6 
+         
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi""... $ac_c" 1>&6
-echo "configure:1609: checking for Makefile.in in c/src/lib/libhwapi" >&5
+echo "configure:1643: checking for Makefile.in in c/src/lib/libhwapi" >&5
 if test -d $srcdir/c/src/lib/libhwapi; then
   rtems_av_save_dir=`pwd`;
@@ -1618 +1652 @@
 fi
 
-
-else
-  \
-      { echo "configure: error: no" 1>&2; exit 1; } \
-
-fi
-
-
-# Check whether --enable-rtemsbsp or --disable-rtemsbsp was given.
-if test "${enable_rtemsbsp+set}" = set; then
-  enableval="$enable_rtemsbsp"
-  \
-      RTEMS_BSP=$enableval \
+;;
+    no)  echo "$ac_t""no" 1>&6 ;;
+    *)  { echo "configure: error: bad value ${enableval} for hwapi option" 1>&2; exit 1; } ;;
+  esac
+else
+  echo "$ac_t""no" 1>&6
 
 fi
@@ -1652 +1679 @@
 
 echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
-echo "configure:1655: checking for Makefile.in in c/build-tools" >&5
+echo "configure:1682: checking for Makefile.in in c/build-tools" >&5
 if test -d $srcdir/c/build-tools; then
   rtems_av_save_dir=`pwd`;
@@ -1667 +1694 @@
 
 echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6
-echo "configure:1670: checking for Makefile.in in c/make" >&5
+echo "configure:1697: checking for Makefile.in in c/make" >&5
 if test -d $srcdir/c/make; then
   rtems_av_save_dir=`pwd`;
@@ -1682 +1709 @@
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:1685: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:1712: checking for Makefile.in in c/src/lib/libmisc" >&5
 if test -d $srcdir/c/src/lib/libmisc; then
   rtems_av_save_dir=`pwd`;
@@ -1697 +1724 @@
 
 echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:1700: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:1727: checking for Makefile.in in c/src/tests/samples" >&5
 if test -d $srcdir/c/src/tests/samples; then
   rtems_av_save_dir=`pwd`;
@@ -1835 +1862 @@
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
+c/src/exec/wrapup/Makefile
+c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile
@@ -1977 +2006 @@
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
+c/src/exec/wrapup/Makefile
+c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile

configure.in

@@ -153 +153 @@
 esac
 
+# Override the set of BSPs to be built.
+AC_ARG_ENABLE(rtemsbsp, \
+  [  --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build], \
+      rtems_bsp=$enableval \
+)
+
 # Is this a supported CPU?
 AC_MSG_CHECKING([if cpu $target_cpu is supported])
@@ -164 +170 @@
 # find all the Executive Makefiles
 RTEMS_CHECK_MAKEFILE(c/src/exec/rtems)
-RTEMS_CHECK_MAKEFILE(c/src/exec/posix)
 RTEMS_CHECK_MAKEFILE(c/src/exec/sapi)
-RTEMS_CHECK_MAKEFILE(c/src/exec/wrapup)
+
+if test "$RTEMS_HAS_POSIX" = "yes"; then
+  RTEMS_CHECK_MAKEFILE(c/src/exec/posix)
+  makefiles="$makefiles c/src/exec/posix/Makefile"
+fi
 
 # find all the Makefiles for the BSPs
@@ -190 +199 @@
   # collect makefiles for each bsp
   for i in $rtems_bsp; do
-    RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu/$i)
+    # make sure there is a make/custom file for the bsp
+    if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then
+      AC_MSG_ERROR([no make/custom/${i}.cfg file for BSP $i])
+    fi
+
+    # account for "aliased" bsps which share source code
+    case $i in 
+      mvme162lx)    bspdir=mvme162  ;;  # mvme162 board variant
+      gen68360_040) bspdir=gen68360 ;;  # 68360 in companion mode
+      go32_p5)      bspdir=go32     ;;  # go32 on Pentium class CPU
+      p4600)        bspdir=p4000    ;;  # p4000 board with IDT 4600
+      p4650)        bspdir=p4000    ;;  # p4000 board with IDT 4650
+      *)            bspdir=$i;;
+    esac
+
+    # Is there code where there should be for this BSP?
+    if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then
+      RTEMS_BSP="$RTEMS_BSP $i"
+      # make sure the Makefiles in a bsp directory are only done once
+      echo $bspdirs | grep $bspdir >/dev/null 2>&1
+      if test $? -ne 0 ; then
+        bspdirs="$bspdirs $bspdir"
+        RTEMS_CHECK_MAKEFILE(c/src/lib/libbsp/$target_cpu/$bspdir)
+      fi
+    else
+      AC_MSG_ERROR([unable to find libbsp directory ($bspdir) for  $i])
+    fi
   done
 fi
@@ -223 +258 @@
 dnl AC_PROG_CXX
 
-RTEMS_BSP=$rtems_bsp
+dnl RTEMS_BSP=$rtems_bsp
 RTEMS_HOST=$host_os
 RTEMS_ROOT=`cd $srcdir/c; pwd`
@@ -236 +271 @@
 # If the tests are enabled, then find all the test suite Makefiles
 AC_MSG_CHECKING([Are the test suites enabled? ])
+tests_enabled=yes
 AC_ARG_ENABLE(tests, \
-[  --disable-tests                  disable tests], \
-   AC_MSG_ERROR(no), \
-   AC_MSG_RESULT(yes) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/tools/$target_cpu) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/libtests) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/sptests) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/tmtests) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/mptests) \
-     RTEMS_CHECK_MAKEFILE(c/src/tests/psxtests) \
+[  --enable-tests                   enable tests], \
+  [case "${enableval}" in
+    yes) AC_MSG_RESULT(yes) ;;
+    no)  AC_MSG_RESULT(no) ; tests_enabled=no ;;
+    *)   AC_MSG_ERROR(bad value ${enableval} for tests option) ;;
+  esac],
+AC_MSG_RESULT(yes)
 )
+
+if test "$tests_enabled" = "yes"; then
+   RTEMS_CHECK_MAKEFILE(c/src/tests/tools/$target_cpu)
+   RTEMS_CHECK_MAKEFILE(c/src/tests/libtests)
+   RTEMS_CHECK_MAKEFILE(c/src/tests/sptests)
+   RTEMS_CHECK_MAKEFILE(c/src/tests/tmtests)
+   RTEMS_CHECK_MAKEFILE(c/src/tests/mptests)
+   if test "$RTEMS_HAS_POSIX" = "yes"; then
+     RTEMS_CHECK_MAKEFILE(c/src/tests/psxtests)
+   fi
+fi 
 
 # If the HWAPI is enabled, the find the HWAPI Makefiles
 AC_MSG_CHECKING([Is the HWAPI enabled? ])
 AC_ARG_ENABLE(hwapi, \
-  [  --enable-hwapi                 enable hardware API library], \
-      AC_MSG_RESULT(yes) \
-        RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi), \
-      AC_MSG_ERROR(no) \
-)
-
-AC_ARG_ENABLE(rtemsbsp, \
-  [  --enable-rtemsbsp=bsp1 bsp2 ..   BSPs to include in build], \
-      RTEMS_BSP=$enableval \
+[  --enable-hwapi                 enable hardware API library], \
+  [case "${enableval}" in
+    yes) AC_MSG_RESULT(yes) 
+         RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi);;
+    no)  AC_MSG_RESULT(no) ;;
+    *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
+  esac],
+  AC_MSG_RESULT(no)
 )
 
@@ -295 +339 @@
 c/src/exec/score/tools/Makefile
 c/src/exec/score/tools/generic/Makefile
+c/src/exec/wrapup/Makefile
+c/src/exec/wrapup/rtems/Makefile
 c/src/lib/Makefile
 c/src/lib/include/Makefile