Changeset 80a16ec4 in rtems


Ignore:
Timestamp:
Dec 6, 1997, 3:44:46 PM (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c436b5b
Parents:
af231b4
Message:

Redid hwapi makefile search to remove need for -follow option to find.

Avoid generating Makefiles for KA9Q and C++ when they are disabled.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure

    raf231b4 r80a16ec4  
    13461346  rtems_av_save_dir=`pwd`;
    13471347  cd $srcdir;
    1348   rtems_av_tmp=`find c/src/exec/score/tools/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1348  rtems_av_tmp=`find c/src/exec/score/tools/$target_cpu -name Makefile.in -print | sed 's%\.in%%' | sort`;
    13491349  makefiles="$makefiles $rtems_av_tmp";
    13501350  cd $rtems_av_save_dir;
     
    13611361  rtems_av_save_dir=`pwd`;
    13621362  cd $srcdir;
    1363   rtems_av_tmp=`find c/src/exec/rtems -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1363  rtems_av_tmp=`find c/src/exec/rtems -name Makefile.in -print | sed 's%\.in%%' | sort`;
    13641364  makefiles="$makefiles $rtems_av_tmp";
    13651365  cd $rtems_av_save_dir;
     
    13761376  rtems_av_save_dir=`pwd`;
    13771377  cd $srcdir;
    1378   rtems_av_tmp=`find c/src/exec/sapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1378  rtems_av_tmp=`find c/src/exec/sapi -name Makefile.in -print | sed 's%\.in%%' | sort`;
    13791379  makefiles="$makefiles $rtems_av_tmp";
    13801380  cd $rtems_av_save_dir;
     
    13931393  rtems_av_save_dir=`pwd`;
    13941394  cd $srcdir;
    1395   rtems_av_tmp=`find c/src/exec/posix -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1395  rtems_av_tmp=`find c/src/exec/posix -name Makefile.in -print | sed 's%\.in%%' | sort`;
    13961396  makefiles="$makefiles $rtems_av_tmp";
    13971397  cd $rtems_av_save_dir;
     
    14561456  rtems_av_save_dir=`pwd`;
    14571457  cd $srcdir;
    1458   rtems_av_tmp=`find c/src/lib/libbsp/$target_cpu/$bspdir -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1458  rtems_av_tmp=`find c/src/lib/libbsp/$target_cpu/$bspdir -name Makefile.in -print | sed 's%\.in%%' | sort`;
    14591459  makefiles="$makefiles $rtems_av_tmp";
    14601460  cd $rtems_av_save_dir;
     
    14791479  rtems_av_save_dir=`pwd`;
    14801480  cd $srcdir;
    1481   rtems_av_tmp=`find c/src/lib/libcpu/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1481  rtems_av_tmp=`find c/src/lib/libcpu/$target_cpu -name Makefile.in -print | sed 's%\.in%%' | sort`;
    14821482  makefiles="$makefiles $rtems_av_tmp";
    14831483  cd $rtems_av_save_dir;
     
    14961496  rtems_av_save_dir=`pwd`;
    14971497  cd $srcdir;
    1498   rtems_av_tmp=`find c/src/lib/start/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1498  rtems_av_tmp=`find c/src/lib/start/$target_cpu -name Makefile.in -print | sed 's%\.in%%' | sort`;
    14991499  makefiles="$makefiles $rtems_av_tmp";
    15001500  cd $rtems_av_save_dir;
     
    15271527PROJECT_ROOT=`pwd;`
    15281528
    1529 # For now always generate the KA9Q TCP/IP Makefiles
    1530 makefiles="$makefiles c/src/lib/libka9q/Makefile"
    1531 
    1532 # For now always generate the C++ Makefiles
    1533 makefiles="$makefiles c/src/lib/librtems++/Makefile"
     1529# If the KA9Q TCP/IP stack is enabled, then find all KA9Q Makefiles
     1530if test "$RTEMS_HAS_KA9Q" = "yes"; then
     1531  makefiles="$makefiles c/src/lib/libka9q/Makefile"
     1532fi
     1533
     1534# If the C++ support is enabled, then include the Makefiles
     1535if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     1536  makefiles="$makefiles c/src/lib/librtems++/Makefile"
     1537fi
    15341538
    15351539# If the tests are enabled, then find all the test suite Makefiles
    15361540echo $ac_n "checking Are the test suites enabled? ""... $ac_c" 1>&6
    1537 echo "configure:1538: checking Are the test suites enabled? " >&5
     1541echo "configure:1542: checking Are the test suites enabled? " >&5
    15381542tests_enabled=yes
    15391543# Check whether --enable-tests or --disable-tests was given.
     
    15551559   
    15561560echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
    1557 echo "configure:1558: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
     1561echo "configure:1562: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
    15581562if test -d $srcdir/c/src/tests/tools/$target_cpu; then
    15591563  rtems_av_save_dir=`pwd`;
    15601564  cd $srcdir;
    1561   rtems_av_tmp=`find c/src/tests/tools/$target_cpu -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1565  rtems_av_tmp=`find c/src/tests/tools/$target_cpu -name Makefile.in -print | sed 's%\.in%%' | sort`;
    15621566  makefiles="$makefiles $rtems_av_tmp";
    15631567  cd $rtems_av_save_dir;
     
    15701574   
    15711575echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
    1572 echo "configure:1573: checking for Makefile.in in c/src/tests/libtests" >&5
     1576echo "configure:1577: checking for Makefile.in in c/src/tests/libtests" >&5
    15731577if test -d $srcdir/c/src/tests/libtests; then
    15741578  rtems_av_save_dir=`pwd`;
    15751579  cd $srcdir;
    1576   rtems_av_tmp=`find c/src/tests/libtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1580  rtems_av_tmp=`find c/src/tests/libtests -name Makefile.in -print | sed 's%\.in%%' | sort`;
    15771581  makefiles="$makefiles $rtems_av_tmp";
    15781582  cd $rtems_av_save_dir;
     
    15851589   
    15861590echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
    1587 echo "configure:1588: checking for Makefile.in in c/src/tests/sptests" >&5
     1591echo "configure:1592: checking for Makefile.in in c/src/tests/sptests" >&5
    15881592if test -d $srcdir/c/src/tests/sptests; then
    15891593  rtems_av_save_dir=`pwd`;
    15901594  cd $srcdir;
    1591   rtems_av_tmp=`find c/src/tests/sptests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1595  rtems_av_tmp=`find c/src/tests/sptests -name Makefile.in -print | sed 's%\.in%%' | sort`;
    15921596  makefiles="$makefiles $rtems_av_tmp";
    15931597  cd $rtems_av_save_dir;
     
    16001604   
    16011605echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
    1602 echo "configure:1603: checking for Makefile.in in c/src/tests/tmtests" >&5
     1606echo "configure:1607: checking for Makefile.in in c/src/tests/tmtests" >&5
    16031607if test -d $srcdir/c/src/tests/tmtests; then
    16041608  rtems_av_save_dir=`pwd`;
    16051609  cd $srcdir;
    1606   rtems_av_tmp=`find c/src/tests/tmtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1610  rtems_av_tmp=`find c/src/tests/tmtests -name Makefile.in -print | sed 's%\.in%%' | sort`;
    16071611  makefiles="$makefiles $rtems_av_tmp";
    16081612  cd $rtems_av_save_dir;
     
    16151619   
    16161620echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
    1617 echo "configure:1618: checking for Makefile.in in c/src/tests/mptests" >&5
     1621echo "configure:1622: checking for Makefile.in in c/src/tests/mptests" >&5
    16181622if test -d $srcdir/c/src/tests/mptests; then
    16191623  rtems_av_save_dir=`pwd`;
    16201624  cd $srcdir;
    1621   rtems_av_tmp=`find c/src/tests/mptests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1625  rtems_av_tmp=`find c/src/tests/mptests -name Makefile.in -print | sed 's%\.in%%' | sort`;
    16221626  makefiles="$makefiles $rtems_av_tmp";
    16231627  cd $rtems_av_save_dir;
     
    16311635     
    16321636echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
    1633 echo "configure:1634: checking for Makefile.in in c/src/tests/psxtests" >&5
     1637echo "configure:1638: checking for Makefile.in in c/src/tests/psxtests" >&5
    16341638if test -d $srcdir/c/src/tests/psxtests; then
    16351639  rtems_av_save_dir=`pwd`;
    16361640  cd $srcdir;
    1637   rtems_av_tmp=`find c/src/tests/psxtests -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1641  rtems_av_tmp=`find c/src/tests/psxtests -name Makefile.in -print | sed 's%\.in%%' | sort`;
    16381642  makefiles="$makefiles $rtems_av_tmp";
    16391643  cd $rtems_av_save_dir;
     
    16491653# If the HWAPI is enabled, the find the HWAPI Makefiles
    16501654echo $ac_n "checking Is the HWAPI enabled? ""... $ac_c" 1>&6
    1651 echo "configure:1652: checking Is the HWAPI enabled? " >&5
     1655echo "configure:1656: checking Is the HWAPI enabled? " >&5
    16521656# Check whether --enable-hwapi or --disable-hwapi was given.
    16531657if test "${enable_hwapi+set}" = set; then
     
    16561660  case "${enableval}" in
    16571661    yes) echo "$ac_t""yes" 1>&6
    1658          
    1659 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi""... $ac_c" 1>&6
    1660 echo "configure:1661: checking for Makefile.in in c/src/lib/libhwapi" >&5
    1661 if test -d $srcdir/c/src/lib/libhwapi; then
    1662   rtems_av_save_dir=`pwd`;
    1663   cd $srcdir;
    1664   rtems_av_tmp=`find c/src/lib/libhwapi -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
    1665   makefiles="$makefiles $rtems_av_tmp";
    1666   cd $rtems_av_save_dir;
    1667   echo "$ac_t""done" 1>&6
    1668 else
    1669   echo "$ac_t""no" 1>&6
    1670 fi
    1671 
    1672 ;;
     1662         if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then
     1663            makefiles="$makefiles c/src/lib/libhwapi/Makefile"
     1664           
     1665echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
     1666echo "configure:1667: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
     1667if test -d $srcdir/c/src/lib/libhwapi/analog; then
     1668  rtems_av_save_dir=`pwd`;
     1669  cd $srcdir;
     1670  rtems_av_tmp=`find c/src/lib/libhwapi/analog -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1671  makefiles="$makefiles $rtems_av_tmp";
     1672  cd $rtems_av_save_dir;
     1673  echo "$ac_t""done" 1>&6
     1674else
     1675  echo "$ac_t""no" 1>&6
     1676fi
     1677
     1678
     1679           
     1680echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
     1681echo "configure:1682: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
     1682if test -d $srcdir/c/src/lib/libhwapi/discrete; then
     1683  rtems_av_save_dir=`pwd`;
     1684  cd $srcdir;
     1685  rtems_av_tmp=`find c/src/lib/libhwapi/discrete -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1686  makefiles="$makefiles $rtems_av_tmp";
     1687  cd $rtems_av_save_dir;
     1688  echo "$ac_t""done" 1>&6
     1689else
     1690  echo "$ac_t""no" 1>&6
     1691fi
     1692
     1693
     1694           
     1695echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
     1696echo "configure:1697: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
     1697if test -d $srcdir/c/src/lib/libhwapi/drivers; then
     1698  rtems_av_save_dir=`pwd`;
     1699  cd $srcdir;
     1700  rtems_av_tmp=`find c/src/lib/libhwapi/drivers -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1701  makefiles="$makefiles $rtems_av_tmp";
     1702  cd $rtems_av_save_dir;
     1703  echo "$ac_t""done" 1>&6
     1704else
     1705  echo "$ac_t""no" 1>&6
     1706fi
     1707
     1708
     1709           
     1710echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/eeprom""... $ac_c" 1>&6
     1711echo "configure:1712: checking for Makefile.in in c/src/lib/libhwapi/eeprom" >&5
     1712if test -d $srcdir/c/src/lib/libhwapi/eeprom; then
     1713  rtems_av_save_dir=`pwd`;
     1714  cd $srcdir;
     1715  rtems_av_tmp=`find c/src/lib/libhwapi/eeprom -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1716  makefiles="$makefiles $rtems_av_tmp";
     1717  cd $rtems_av_save_dir;
     1718  echo "$ac_t""done" 1>&6
     1719else
     1720  echo "$ac_t""no" 1>&6
     1721fi
     1722
     1723
     1724           
     1725echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
     1726echo "configure:1727: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
     1727if test -d $srcdir/c/src/lib/libhwapi/serial; then
     1728  rtems_av_save_dir=`pwd`;
     1729  cd $srcdir;
     1730  rtems_av_tmp=`find c/src/lib/libhwapi/serial -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1731  makefiles="$makefiles $rtems_av_tmp";
     1732  cd $rtems_av_save_dir;
     1733  echo "$ac_t""done" 1>&6
     1734else
     1735  echo "$ac_t""no" 1>&6
     1736fi
     1737
     1738
     1739           
     1740echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
     1741echo "configure:1742: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
     1742if test -d $srcdir/c/src/lib/libhwapi/support; then
     1743  rtems_av_save_dir=`pwd`;
     1744  cd $srcdir;
     1745  rtems_av_tmp=`find c/src/lib/libhwapi/support -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1746  makefiles="$makefiles $rtems_av_tmp";
     1747  cd $rtems_av_save_dir;
     1748  echo "$ac_t""done" 1>&6
     1749else
     1750  echo "$ac_t""no" 1>&6
     1751fi
     1752
     1753
     1754           
     1755echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
     1756echo "configure:1757: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
     1757if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
     1758  rtems_av_save_dir=`pwd`;
     1759  cd $srcdir;
     1760  rtems_av_tmp=`find c/src/lib/libhwapi/wrapup -name Makefile.in -print | sed 's%\.in%%' | sort`;
     1761  makefiles="$makefiles $rtems_av_tmp";
     1762  cd $rtems_av_save_dir;
     1763  echo "$ac_t""done" 1>&6
     1764else
     1765  echo "$ac_t""no" 1>&6
     1766fi
     1767
     1768
     1769         else
     1770            { echo "configure: error: No source code found for the HWAPI" 1>&2; exit 1; }
     1771         fi
     1772         ;;
    16731773    no)  echo "$ac_t""no" 1>&6 ;;
    16741774    *)  { echo "configure: error: bad value ${enableval} for hwapi option" 1>&2; exit 1; } ;;
     
    16971797
    16981798echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
    1699 echo "configure:1700: checking for Makefile.in in c/build-tools" >&5
     1799echo "configure:1800: checking for Makefile.in in c/build-tools" >&5
    17001800if test -d $srcdir/c/build-tools; then
    17011801  rtems_av_save_dir=`pwd`;
    17021802  cd $srcdir;
    1703   rtems_av_tmp=`find c/build-tools -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1803  rtems_av_tmp=`find c/build-tools -name Makefile.in -print | sed 's%\.in%%' | sort`;
    17041804  makefiles="$makefiles $rtems_av_tmp";
    17051805  cd $rtems_av_save_dir;
     
    17121812
    17131813echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6
    1714 echo "configure:1715: checking for Makefile.in in c/make" >&5
     1814echo "configure:1815: checking for Makefile.in in c/make" >&5
    17151815if test -d $srcdir/c/make; then
    17161816  rtems_av_save_dir=`pwd`;
    17171817  cd $srcdir;
    1718   rtems_av_tmp=`find c/make -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1818  rtems_av_tmp=`find c/make -name Makefile.in -print | sed 's%\.in%%' | sort`;
    17191819  makefiles="$makefiles $rtems_av_tmp";
    17201820  cd $rtems_av_save_dir;
     
    17271827
    17281828echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
    1729 echo "configure:1730: checking for Makefile.in in c/src/lib/libmisc" >&5
     1829echo "configure:1830: checking for Makefile.in in c/src/lib/libmisc" >&5
    17301830if test -d $srcdir/c/src/lib/libmisc; then
    17311831  rtems_av_save_dir=`pwd`;
    17321832  cd $srcdir;
    1733   rtems_av_tmp=`find c/src/lib/libmisc -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1833  rtems_av_tmp=`find c/src/lib/libmisc -name Makefile.in -print | sed 's%\.in%%' | sort`;
    17341834  makefiles="$makefiles $rtems_av_tmp";
    17351835  cd $rtems_av_save_dir;
     
    17421842
    17431843echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
    1744 echo "configure:1745: checking for Makefile.in in c/src/tests/samples" >&5
     1844echo "configure:1845: checking for Makefile.in in c/src/tests/samples" >&5
    17451845if test -d $srcdir/c/src/tests/samples; then
    17461846  rtems_av_save_dir=`pwd`;
    17471847  cd $srcdir;
    1748   rtems_av_tmp=`find c/src/tests/samples -name Makefile.in -follow -print | sed 's%\.in%%' | sort`;
     1848  rtems_av_tmp=`find c/src/tests/samples -name Makefile.in -print | sed 's%\.in%%' | sort`;
    17491849  makefiles="$makefiles $rtems_av_tmp";
    17501850  cd $rtems_av_save_dir;
  • configure.in

    raf231b4 r80a16ec4  
    268268PROJECT_ROOT=`pwd;`
    269269
    270 # For now always generate the KA9Q TCP/IP Makefiles
    271 makefiles="$makefiles c/src/lib/libka9q/Makefile"
    272 
    273 # For now always generate the C++ Makefiles
    274 makefiles="$makefiles c/src/lib/librtems++/Makefile"
     270# If the KA9Q TCP/IP stack is enabled, then find all KA9Q Makefiles
     271if test "$RTEMS_HAS_KA9Q" = "yes"; then
     272  makefiles="$makefiles c/src/lib/libka9q/Makefile"
     273fi
     274
     275# If the C++ support is enabled, then include the Makefiles
     276if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     277  makefiles="$makefiles c/src/lib/librtems++/Makefile"
     278fi
    275279
    276280# If the tests are enabled, then find all the test suite Makefiles
     
    304308  [case "${enableval}" in
    305309    yes) AC_MSG_RESULT(yes)
    306          RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi);;
     310         if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then
     311            makefiles="$makefiles c/src/lib/libhwapi/Makefile"
     312            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/analog)
     313            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/discrete)
     314            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/drivers)
     315            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/eeprom)
     316            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/serial)
     317            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/support)
     318            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/wrapup)
     319         else
     320            AC_MSG_ERROR(No source code found for the HWAPI)
     321         fi
     322         ;;
    307323    no)  AC_MSG_RESULT(no) ;;
    308324    *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
Note: See TracChangeset for help on using the changeset viewer.