diff options
Diffstat (limited to 'c/src/tests/tools')
| -rw-r--r-- | c/src/tests/tools/Makefile.in | 16 | ||||
| -rw-r--r-- | c/src/tests/tools/generic/Makefile.am | 10 | ||||
| -rw-r--r-- | c/src/tests/tools/generic/Makefile.in | 24 | ||||
| -rw-r--r-- | c/src/tests/tools/generic/aclocal.m4 | 97 | ||||
| -rw-r--r-- | c/src/tests/tools/generic/configure | 105 | ||||
| -rw-r--r-- | c/src/tests/tools/generic/configure.in | 5 |
6 files changed, 205 insertions, 52 deletions
diff --git a/c/src/tests/tools/Makefile.in b/c/src/tests/tools/Makefile.in index bb102ce6c8..50467c106c 100644 --- a/c/src/tests/tools/Makefile.in +++ b/c/src/tests/tools/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/tests/tools +top_builddir = .. +subdir = tools -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=generic $(wildcard $(RTEMS_CPU)) +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = generic $(wildcard $(RTEMS_CPU)) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/tools/generic/Makefile.am b/c/src/tests/tools/generic/Makefile.am index 7407cc891c..7406624ef4 100644 --- a/c/src/tests/tools/generic/Makefile.am +++ b/c/src/tests/tools/generic/Makefile.am @@ -2,15 +2,15 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS=difftest sorttimes # HACK: install to build-tree all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests + $(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/tests + $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/@RTEMS_BSP@/tests + $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/@RTEMS_BSP@/tests include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/tests/tools/generic/Makefile.in b/c/src/tests/tools/generic/Makefile.in index 843176a01a..2418c278d7 100644 --- a/c/src/tests/tools/generic/Makefile.in +++ b/c/src/tests/tools/generic/Makefile.in @@ -44,6 +44,8 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ @@ -66,17 +68,21 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +INSTALL_CHANGE = @INSTALL_CHANGE@ KSH = @KSH@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKHEX = @PACKHEX@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_BSP = @RTEMS_BSP@ RTEMS_CPU = @RTEMS_CPU@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS = difftest sorttimes ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -94,19 +100,19 @@ TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../automake/local.am +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../automake/local.am cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) difftest: $(top_builddir)/config.status difftest.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -234,9 +240,9 @@ mostlyclean distclean maintainer-clean # HACK: install to build-tree all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests + $(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/tests + $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/@RTEMS_BSP@/tests + $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/@RTEMS_BSP@/tests debug-am: debug: debug-am diff --git a/c/src/tests/tools/generic/aclocal.m4 b/c/src/tests/tools/generic/aclocal.m4 index 0f2b9f3276..fcd3408079 100644 --- a/c/src/tests/tools/generic/aclocal.m4 +++ b/c/src/tests/tools/generic/aclocal.m4 @@ -27,10 +27,6 @@ TARGET_SUBDIR=".") RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." -AC_SUBST(PROJECT_ROOT) - dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) @@ -46,9 +42,6 @@ if test -z "$RTEMS_VERSION"; then AC_MSG_ERROR(Unable to determine version) fi AC_MSG_RESULT($RTEMS_VERSION) - -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -AC_SUBST(RTEMS_ROOT) ])dnl dnl @@ -184,6 +177,96 @@ else fi AC_SUBST($1)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + +dnl $Id$ + +dnl Override the set of BSPs to be built. +dnl used by the toplevel configure script +dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list) +AC_DEFUN(RTEMS_ENABLE_RTEMSBSP, +[ +AC_ARG_ENABLE(rtemsbsp, +[ --enable-rtemsbsp=bsp1 bsp2 .. BSPs to include in build], +[case "${enableval}" in + yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp=\"bsp1 bsp2\"]);; + *) $1=$enableval;; +esac],[$1=""]) +]) + +dnl Pass a single BSP via an environment variable +dnl used by per BSP configure scripts +AC_DEFUN(RTEMS_ENV_RTEMSBSP, +[dnl +AC_MSG_CHECKING([for RTEMS_BSP]) +AC_CACHE_VAL(rtems_cv_RTEMS_BSP, +[dnl + test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"; +])dnl +if test -z "$rtems_cv_RTEMS_BSP"; then + AC_MSG_ERROR([Missing RTEMS_BSP]) +fi +RTEMS_BSP="$rtems_cv_RTEMS_BSP" +AC_MSG_RESULT(${RTEMS_BSP}) +AC_SUBST(RTEMS_BSP) +]) + +dnl +dnl $Id$ +dnl + +AC_DEFUN(RTEMS_PROJECT_ROOT, +[dnl +AC_REQUIRE([RTEMS_TOP]) +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi +AC_SUBST(PROJECT_ROOT) + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP +AC_SUBST(RTEMS_ROOT) + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" +AC_SUBST(INSTALL_CHANGE) + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" +AC_SUBST(PACKHEX) +]) + + dnl $Id$ AC_DEFUN(RTEMS_PATH_KSH, diff --git a/c/src/tests/tools/generic/configure b/c/src/tests/tools/generic/configure index 12ee4e9bfc..d858bdc156 100644 --- a/c/src/tests/tools/generic/configure +++ b/c/src/tests/tools/generic/configure @@ -13,6 +13,9 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-target-subdir=DIR" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -555,12 +558,8 @@ fi RTEMS_TOPdir="../../../../.."; -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." - - echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6 -echo "configure:564: checking for RTEMS Version" >&5 +echo "configure:563: checking for RTEMS Version" >&5 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \ sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'` @@ -572,9 +571,6 @@ if test -z "$RTEMS_VERSION"; then fi echo "$ac_t""$RTEMS_VERSION" 1>&6 -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; - - # Do some error checking and defaulting for the host and target type. @@ -604,7 +600,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:608: checking host system type" >&5 +echo "configure:604: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -625,7 +621,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:629: checking target system type" >&5 +echo "configure:625: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -643,7 +639,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:647: checking build system type" >&5 +echo "configure:643: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -666,7 +662,7 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:670: checking rtems target cpu" >&5 +echo "configure:666: checking rtems target cpu" >&5 case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) @@ -704,7 +700,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:708: checking for a BSD compatible install" >&5 +echo "configure:704: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -757,7 +753,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:761: checking whether build environment is sane" >&5 +echo "configure:757: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -814,7 +810,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:814: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -853,7 +849,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:857: checking for working aclocal" >&5 +echo "configure:853: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -866,7 +862,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:870: checking for working autoconf" >&5 +echo "configure:866: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -879,7 +875,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:883: checking for working automake" >&5 +echo "configure:879: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -892,7 +888,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:896: checking for working autoheader" >&5 +echo "configure:892: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -905,7 +901,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:909: checking for working makeinfo" >&5 +echo "configure:905: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -918,6 +914,63 @@ else fi +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:919: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE + + +# Override the set of BSPs to be built. + +echo $ac_n "checking for RTEMS_BSP""... $ac_c" 1>&6 +echo "configure:944: checking for RTEMS_BSP" >&5 +if eval "test \"`echo '$''{'rtems_cv_RTEMS_BSP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"; + +fi +if test -z "$rtems_cv_RTEMS_BSP"; then + { echo "configure: error: Missing RTEMS_BSP" 1>&2; exit 1; } +fi +RTEMS_BSP="$rtems_cv_RTEMS_BSP" +echo "$ac_t""${RTEMS_BSP}" 1>&6 + + + +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi + + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP + + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" + + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" + + for ac_prog in bash ksh sh @@ -925,7 +978,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1115,8 +1168,6 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@RTEMS_TOPdir@%$RTEMS_TOPdir%g -s%@PROJECT_ROOT@%$PROJECT_ROOT%g -s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1144,6 +1195,14 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g +s%@RTEMS_BSP@%$RTEMS_BSP%g +s%@PROJECT_ROOT@%$PROJECT_ROOT%g +s%@RTEMS_ROOT@%$RTEMS_ROOT%g +s%@INSTALL_CHANGE@%$INSTALL_CHANGE%g +s%@PACKHEX@%$PACKHEX%g s%@KSH@%$KSH%g CEOF diff --git a/c/src/tests/tools/generic/configure.in b/c/src/tests/tools/generic/configure.in index 750a17f99c..420f69c7e2 100644 --- a/c/src/tests/tools/generic/configure.in +++ b/c/src/tests/tools/generic/configure.in @@ -9,6 +9,11 @@ RTEMS_TOP(../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-tests-tools-generic,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE +# Override the set of BSPs to be built. + +RTEMS_ENV_RTEMSBSP +RTEMS_PROJECT_ROOT RTEMS_PATH_KSH |