diff options
Diffstat (limited to '')
-rw-r--r-- | tools/build/Makefile.in | 89 | ||||
-rw-r--r-- | tools/build/aclocal.m4 | 11 | ||||
-rw-r--r-- | tools/build/configure | 79 | ||||
-rw-r--r-- | tools/build/scripts/Makefile.in | 18 | ||||
-rw-r--r-- | tools/build/src/Makefile.in | 18 |
5 files changed, 104 insertions, 111 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index d8325d1fee..5fe1950f04 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -15,23 +15,6 @@ # -# $Id$ - -# Borrowed from automake-1.4, adapted to support RTEMS's -# "make debug", "make debug_install", "make profile", "make profile_install" - -# NOTE: This is a temporary work-around to keep -# "make debug" and "make debug_install" working. -# Once automake is fully integrated these make targets -# and this file will probably be removed - - -# $Id$ - -# NOTE: This is a temporary work-around to keep -# "make debug" and "make debug_install" working. -# Once automake is fully integrated these make targets -# and this file will probably be removed SHELL = @SHELL@ @@ -86,6 +69,7 @@ KSH = @KSH@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ @@ -97,8 +81,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in \ -src/config.h.in src/stamp-h.in +DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -122,34 +105,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -src/config.h: src/stamp-h - @if test ! -f $@; then \ - rm -f src/stamp-h; \ - $(MAKE) src/stamp-h; \ - else :; fi -src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > src/stamp-h 2> /dev/null -$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/src/stamp-h.in; \ - $(MAKE) $(srcdir)/src/stamp-h.in; \ - else :; fi -$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f src/config.h - -maintainer-clean-hdr: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -338,32 +293,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ @@ -373,6 +328,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +preinstall-recursive \ debug-recursive debug_install-recursive \ profile-recursive profile_install-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ @@ -401,9 +357,14 @@ profile: profile-recursive profile_install: profile_install-recursive +preinstall: preinstall-recursive + .PHONY: \ -debug debug-recursive debug_install \ -profile profile-recursive profile_install +debug debug-recursive \ +debug_install \ +profile profile-recursive \ +profile_install \ +preinstall preinstall-recursive debug-am: @@ -413,6 +374,8 @@ debug_install-am: debug_install: debug_install-am +.PHONY: debug debug_install debug-am + profile-am: profile: profile-am @@ -421,7 +384,13 @@ profile_install-am: profile_install: profile_install-am -.PHONY: debug debug_install profile profile_install +.PHONY: profile profile_install profile-am + +preinstall-am: + +preinstall: preinstall-am + +.PHONY: preinstall preinstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tools/build/aclocal.m4 b/tools/build/aclocal.m4 index 40c08bdfa0..019b89fb09 100644 --- a/tools/build/aclocal.m4 +++ b/tools/build/aclocal.m4 @@ -19,10 +19,16 @@ dnl $1 .. relative path from this configure.in to the toplevel configure.in dnl AC_DEFUN(RTEMS_TOP, [dnl +AC_ARG_WITH(target-subdir, +[ --with-target-subdir=DIR], +TARGET_SUBDIR="$withval", +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 @@ -41,9 +47,8 @@ AC_MSG_ERROR(Unable to determine version) fi AC_MSG_RESULT($RTEMS_VERSION) -dnl FIXME: This once gets activated in future or will be removed -dnl RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -dnl AC_SUBST(RTEMS_ROOT) +RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; +AC_SUBST(RTEMS_ROOT) ])dnl # Do all the work for Automake. This macro actually does too much -- diff --git a/tools/build/configure b/tools/build/configure index 3a0e38c8e1..f88e7bdbdc 100644 --- a/tools/build/configure +++ b/tools/build/configure @@ -11,6 +11,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --with-target-subdir=DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -540,14 +542,24 @@ ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +# Check whether --with-target-subdir or --without-target-subdir was given. +if test "${with_target_subdir+set}" = set; then + withval="$with_target_subdir" + TARGET_SUBDIR="$withval" +else + TARGET_SUBDIR="." +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:551: 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'` @@ -559,6 +571,8 @@ if test -z "$RTEMS_VERSION"; then fi echo "$ac_t""$RTEMS_VERSION" 1>&6 +RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; + @@ -568,7 +582,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:572: checking host system type" >&5 +echo "configure:586: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -601,7 +615,7 @@ echo "$ac_t""$host" 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:605: checking for a BSD compatible install" >&5 +echo "configure:619: 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 @@ -654,7 +668,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:658: checking whether build environment is sane" >&5 +echo "configure:672: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -711,7 +725,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:715: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:729: 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 @@ -750,7 +764,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:754: checking for working aclocal" >&5 +echo "configure:768: 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. @@ -763,7 +777,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:767: checking for working autoconf" >&5 +echo "configure:781: 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. @@ -776,7 +790,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:780: checking for working automake" >&5 +echo "configure:794: 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. @@ -789,7 +803,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:793: checking for working autoheader" >&5 +echo "configure:807: 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. @@ -802,7 +816,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:806: checking for working makeinfo" >&5 +echo "configure:820: 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. @@ -816,12 +830,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:820: checking for Cygwin environment" >&5 +echo "configure:834: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 825 "configure" +#line 839 "configure" #include "confdefs.h" int main() { @@ -832,7 +846,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -849,19 +863,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:853: checking for mingw32 environment" >&5 +echo "configure:867: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 858 "configure" +#line 872 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -880,7 +894,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:884: checking for executable suffix" >&5 +echo "configure:898: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -890,7 +904,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -914,7 +928,7 @@ ac_exeext=$EXEEXT # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:918: checking for $ac_word" >&5 +echo "configure:932: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -944,7 +958,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:948: checking for $ac_word" >&5 +echo "configure:962: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -995,7 +1009,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:999: checking for $ac_word" >&5 +echo "configure:1013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1027,7 +1041,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1031: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1045: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1038,12 +1052,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1042 "configure" +#line 1056 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1069,12 +1083,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1073: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1087: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1078: checking whether we are using GNU C" >&5 +echo "configure:1092: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1083,7 +1097,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1102,7 +1116,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1106: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1120: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1136,12 +1150,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1140: checking for $ac_func" >&5 +echo "configure:1154: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1145 "configure" +#line 1159 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1164,7 +1178,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1195,7 +1209,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:1199: checking for $ac_word" >&5 +echo "configure:1213: 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 @@ -1383,6 +1397,7 @@ 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 diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in index 0567ec32a1..1a1795a6c1 100644 --- a/tools/build/scripts/Makefile.in +++ b/tools/build/scripts/Makefile.in @@ -15,13 +15,6 @@ # -# $Id$ - -# NOTE: This is a temporary work-around to keep -# "make debug" and "make debug_install" working. -# Once automake is fully integrated these make targets -# and this file will probably be removed - SHELL = @SHELL@ @@ -77,6 +70,7 @@ KSH = @KSH@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ @@ -241,6 +235,8 @@ debug_install-am: debug_install: debug_install-am +.PHONY: debug debug_install debug-am + profile-am: profile: profile-am @@ -249,7 +245,13 @@ profile_install-am: profile_install: profile_install-am -.PHONY: debug debug_install profile profile_install +.PHONY: profile profile_install profile-am + +preinstall-am: + +preinstall: preinstall-am + +.PHONY: preinstall preinstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in index a63d34c8ba..ac6655e8a8 100644 --- a/tools/build/src/Makefile.in +++ b/tools/build/src/Makefile.in @@ -15,13 +15,6 @@ # -# $Id$ - -# NOTE: This is a temporary work-around to keep -# "make debug" and "make debug_install" working. -# Once automake is fully integrated these make targets -# and this file will probably be removed - SHELL = @SHELL@ @@ -77,6 +70,7 @@ KSH = @KSH@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PROJECT_ROOT = @PROJECT_ROOT@ +RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ @@ -407,6 +401,8 @@ debug_install-am: debug_install: debug_install-am +.PHONY: debug debug_install debug-am + profile-am: profile: profile-am @@ -415,7 +411,13 @@ profile_install-am: profile_install: profile_install-am -.PHONY: debug debug_install profile profile_install +.PHONY: profile profile_install profile-am + +preinstall-am: + +preinstall: preinstall-am + +.PHONY: preinstall preinstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |