summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-30 17:52:50 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-30 17:52:50 +0000
commit1896a650fc382d343844b56f4b79efe31562755e (patch)
tree922de4dd1237cfcf6c7be0a8050e1e964fceadad /c/src/lib
parentFixed typos. (diff)
downloadrtems-1896a650fc382d343844b56f4b79efe31562755e.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The main topic is replacing the hard-coded values for HAS_MP and HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks (This is the patch I had mentioned before earlier this week). CHANGES * HAS_MP removed from custom/*.cfg, replaced with configuration time autoconf check * HAS_RDBG removed from custom/*.cfg, replaced with configuration-time autoconf check * NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp values (i.e. HAS_MP, HAS_RDBG), gets installed as $(prefix)/<bsp>/make/bsp.cfg * NEW: default.cfg includes bsp.cfg - this change is backward compatible. * IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory Makefile.ins * HACK: a bug in acpolish mis-handles addtions to makefile variables which are enclosed in gmake conditionals: c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in * Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of unneeded subdirectories in various configure.in files. * Several minor changes in Makefile.ins and configure.ins, wrt. to the order of including *.cfg and defining Makefile variables APPLYING THE PATCH: patch -p1 < rtems-rc-19990709-4.diff ./autogen
Diffstat (limited to 'c/src/lib')
-rw-r--r--c/src/lib/aclocal.m439
-rw-r--r--c/src/lib/configure90
-rw-r--r--c/src/lib/configure.in8
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in10
-rw-r--r--c/src/lib/libbsp/i386/force386/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/i386/i386ex/console/Makefile.in9
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in9
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in9
-rw-r--r--c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/start/Makefile.in15
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in15
-rw-r--r--c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in5
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in2
-rw-r--r--c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in2
-rw-r--r--c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in10
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in11
-rw-r--r--c/src/lib/libchip/serial/Makefile.in2
-rw-r--r--c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in2
-rw-r--r--c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in2
-rw-r--r--c/src/lib/libmisc/monitor/Makefile.in22
-rw-r--r--c/src/lib/libnetworking/include/Makefile.in20
-rw-r--r--c/src/lib/librdbg/i386/pc386/Makefile.in4
26 files changed, 183 insertions, 131 deletions
diff --git a/c/src/lib/aclocal.m4 b/c/src/lib/aclocal.m4
index cbcba1c822..a8de869b78 100644
--- a/c/src/lib/aclocal.m4
+++ b/c/src/lib/aclocal.m4
@@ -948,6 +948,33 @@ else
fi
])dnl
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+ rtems_cv_HAS_MP,
+ [dnl
+ if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then
+ if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+ rtems_cv_HAS_MP="yes" ;
+ else
+ rtems_cv_HAS_MP="disabled";
+ fi
+ else
+ rtems_cv_HAS_MP="no";
+ fi
+ ])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])
+
dnl
dnl $Id$
dnl
@@ -1009,14 +1036,16 @@ AC_DEFUN(RTEMS_CHECK_RDBG,
[dnl
AC_REQUIRE([RTEMS_TOP])dnl
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_CACHE_CHECK([whether cpu supports librdbg],
- rtems_cv_has_rdbg,
+AC_CACHE_CHECK([whether BSP supports librdbg],
+ rtems_cv_HAS_RDBG,
[
- if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
- rtems_cv_has_rdbg="yes" ;
+ if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${$1}"; then
+ rtems_cv_HAS_RDBG="yes" ;
else
- rtems_cv_has_rdbg="no";
+ rtems_cv_HAS_RDBG="no";
fi
])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+AC_SUBST(HAS_RDBG)
])
diff --git a/c/src/lib/configure b/c/src/lib/configure
index 5cdeaf695a..6b94ebdacb 100644
--- a/c/src/lib/configure
+++ b/c/src/lib/configure
@@ -2641,6 +2641,31 @@ else
{ echo "configure: error: no" 1>&2; exit 1; }
fi
+echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
+echo "configure:2646: checking whether BSP supports multiprocessing" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then
+ if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+ rtems_cv_HAS_MP="yes" ;
+ else
+ rtems_cv_HAS_MP="disabled";
+ fi
+ else
+ rtems_cv_HAS_MP="no";
+ fi
+
+fi
+
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+
+
# account for "aliased" bsps which share source code
@@ -2681,7 +2706,7 @@ fi
if test -d "$srcdir/libbsp/$bspcpudir$bspdir"; then
echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6
-echo "configure:2685: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
+echo "configure:2710: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2696,7 +2721,7 @@ fi
echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:2700: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
+echo "configure:2725: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
if test -d $srcdir/libbsp/${bspcpudir}shared; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2732,7 +2757,7 @@ fi
# find all the CPU dependent library Makefiles
echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2736: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
+echo "configure:2761: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
if test -d $srcdir/libcpu/$RTEMS_CPU; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2752,7 +2777,7 @@ case "${target}" in
*)
echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2756: checking for Makefile.in in start/$RTEMS_CPU" >&5
+echo "configure:2781: checking for Makefile.in in start/$RTEMS_CPU" >&5
if test -d $srcdir/start/$RTEMS_CPU; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2781,12 +2806,12 @@ fi
# If the TCP/IP stack is enabled, then find all TCP/IP Makefiles
echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6
-echo "configure:2785: checking if networking is enabled? " >&5
+echo "configure:2810: checking if networking is enabled? " >&5
echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6
if test "$RTEMS_HAS_NETWORKING" = "yes"; then
echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6
-echo "configure:2790: checking for Makefile.in in libnetworking" >&5
+echo "configure:2815: checking for Makefile.in in libnetworking" >&5
if test -d $srcdir/libnetworking; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2801,7 +2826,7 @@ fi
echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6
-echo "configure:2805: checking for Makefile.in in librpc" >&5
+echo "configure:2830: checking for Makefile.in in librpc" >&5
if test -d $srcdir/librpc; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2816,29 +2841,30 @@ fi
if test "$RTEMS_HAS_RDBG" = "yes"; then
- echo $ac_n "checking whether cpu supports librdbg""... $ac_c" 1>&6
-echo "configure:2821: checking whether cpu supports librdbg" >&5
-if eval "test \"`echo '$''{'rtems_cv_has_rdbg'+set}'`\" = set"; then
+ echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
+echo "configure:2846: checking whether BSP supports librdbg" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
- rtems_cv_has_rdbg="yes" ;
+ if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${RTEMS_BSP}"; then
+ rtems_cv_HAS_RDBG="yes" ;
else
- rtems_cv_has_rdbg="no";
+ rtems_cv_HAS_RDBG="no";
fi
fi
-echo "$ac_t""$rtems_cv_has_rdbg" 1>&6
+echo "$ac_t""$rtems_cv_HAS_RDBG" 1>&6
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+
- RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
- if test "$rtems_cv_has_rdbg" = "yes"; then
+ if test "$HAS_RDBG" = "yes"; then
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2842: checking for $ac_word" >&5
+echo "configure:2868: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2869,7 +2895,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:2873: checking for $ac_word" >&5
+echo "configure:2899: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2905,10 +2931,10 @@ done
{ echo "configure: error: missing awk, required to build librdbg" 1>&2; exit 1; }
fi
fi
- if test "$rtems_cv_has_rdbg" = "yes"; then
+ if test "$HAS_RDBG" = "yes"; then
echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6
-echo "configure:2912: checking for Makefile.in in librdbg" >&5
+echo "configure:2938: checking for Makefile.in in librdbg" >&5
if test -d $srcdir/librdbg; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2929,7 +2955,7 @@ fi
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6
-echo "configure:2933: checking for Makefile.in in librtems++" >&5
+echo "configure:2959: checking for Makefile.in in librtems++" >&5
if test -d $srcdir/librtems++; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2960,13 +2986,13 @@ fi
if test "$RTEMS_HAS_HWAPI" = "yes"; then
echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
-echo "configure:2964: checking whether libwapi is present" >&5
+echo "configure:2990: checking whether libwapi is present" >&5
if test -f ${srcdir}/libhwapi/Makefile.in ; then
echo "$ac_t""yes" 1>&6
makefiles="$makefiles libhwapi/Makefile"
echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6
-echo "configure:2970: checking for Makefile.in in libhwapi/analog" >&5
+echo "configure:2996: checking for Makefile.in in libhwapi/analog" >&5
if test -d $srcdir/libhwapi/analog; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2981,7 +3007,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:2985: checking for Makefile.in in libhwapi/discrete" >&5
+echo "configure:3011: checking for Makefile.in in libhwapi/discrete" >&5
if test -d $srcdir/libhwapi/discrete; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2996,7 +3022,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3000: checking for Makefile.in in libhwapi/drivers" >&5
+echo "configure:3026: checking for Makefile.in in libhwapi/drivers" >&5
if test -d $srcdir/libhwapi/drivers; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3011,7 +3037,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3015: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
+echo "configure:3041: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
if test -d $srcdir/libhwapi/non_volatile_memory; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3026,7 +3052,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3030: checking for Makefile.in in libhwapi/serial" >&5
+echo "configure:3056: checking for Makefile.in in libhwapi/serial" >&5
if test -d $srcdir/libhwapi/serial; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3041,7 +3067,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6
-echo "configure:3045: checking for Makefile.in in libhwapi/support" >&5
+echo "configure:3071: checking for Makefile.in in libhwapi/support" >&5
if test -d $srcdir/libhwapi/support; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3056,7 +3082,7 @@ fi
echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3060: checking for Makefile.in in libhwapi/wrapup" >&5
+echo "configure:3086: checking for Makefile.in in libhwapi/wrapup" >&5
if test -d $srcdir/libhwapi/wrapup; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3084,7 +3110,7 @@ fi
# pick up all the Makefiles in required parts of the tree
echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6
-echo "configure:3088: checking for Makefile.in in libchip" >&5
+echo "configure:3114: checking for Makefile.in in libchip" >&5
if test -d $srcdir/libchip; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3099,7 +3125,7 @@ fi
echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6
-echo "configure:3103: checking for Makefile.in in libmisc" >&5
+echo "configure:3129: checking for Makefile.in in libmisc" >&5
if test -d $srcdir/libmisc; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3325,9 +3351,11 @@ s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
s%@RTEMS_GAS_CODE16_TRUE@%$RTEMS_GAS_CODE16_TRUE%g
s%@RTEMS_GAS_CODE16_FALSE@%$RTEMS_GAS_CODE16_FALSE%g
s%@CC@%$CC%g
+s%@HAS_MP@%$HAS_MP%g
s%@RTEMS_LIBBSP_CPU_SUBDIR@%$RTEMS_LIBBSP_CPU_SUBDIR%g
s%@UNIX_TRUE@%$UNIX_TRUE%g
s%@UNIX_FALSE@%$UNIX_FALSE%g
+s%@HAS_RDBG@%$HAS_RDBG%g
s%@RPCGEN@%$RPCGEN%g
s%@AWK@%$AWK%g
s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index 0a2a3f3329..a7a1beea63 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -56,6 +56,7 @@ makefiles="$makefiles libbsp/bare/Makefile"
fi
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
@@ -131,10 +132,9 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then
RTEMS_CHECK_MAKEFILE(librpc)
if test "$RTEMS_HAS_RDBG" = "yes"; then
- RTEMS_CHECK_RDBG
- RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
+ RTEMS_CHECK_RDBG(RTEMS_BSP)
- if test "$rtems_cv_has_rdbg" = "yes"; then
+ if test "$HAS_RDBG" = "yes"; then
AC_CHECK_PROG(RPCGEN,rpcgen,rpcgen)
AC_PROG_AWK
if test -z "$RPCGEN"; then
@@ -144,7 +144,7 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then
AC_MSG_ERROR([missing awk, required to build librdbg])
fi
fi
- if test "$rtems_cv_has_rdbg" = "yes"; then
+ if test "$HAS_RDBG" = "yes"; then
RTEMS_CHECK_MAKEFILE(librdbg)
fi
fi
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
index 8f7c9fff26..ade59a92a1 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
@@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup tty
-# pieces to pick up out of libcpu/hppa
-CPU_PIECES = clock milli timer
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup tty
+# pieces to pick up out of libcpu/hppa
+CPU_PIECES = clock milli timer
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in
index 556ab0be25..ee6419acb2 100644
--- a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in
@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in
index 89a960a0a8..362a11196c 100644
--- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in
+++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in
@@ -11,12 +11,10 @@ subdir = libbsp/i386/i386ex/console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/io
PGM = ${ARCH}/console.rel
-IMPORT_SRC = $(srcdir)/../../shared/io/printk.c
-
# C source names, if any, go here -- minus the .c
C_PIECES = console printk
C_FILES = $(C_PIECES:%=%.c)
@@ -58,13 +56,10 @@ LDFLAGS +=
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
-preinstall:
- ${CP} ${IMPORT_SRC} .
-
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-all: ${ARCH} preinstall $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all
diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
index 9c4bbcd3a3..a52b4b4fd8 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in
@@ -11,12 +11,10 @@ subdir = libbsp/i386/ts_386ex/console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/io
PGM = ${ARCH}/console.rel
-IMPORT_SRC = $(srcdir)/../../shared/io/printk.c
-
# C source names, if any, go here -- minus the .c
C_PIECES = console printk
C_FILES = $(C_PIECES:%=%.c)
@@ -58,13 +56,10 @@ LDFLAGS +=
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
-preinstall:
- ${CP} ${IMPORT_SRC} .
-
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-all: ${ARCH} preinstall $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all
diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
index 351d3111e3..a3eb8f1b1e 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in
@@ -58,7 +58,7 @@ CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
- $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
+ @$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
# Install the program(s), appending _g or _p as appropriate.
# for include files, just use $(INSTALL_CHANGE)
diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
index a9239c3af9..49dc43404a 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in
@@ -69,15 +69,10 @@ LDFLAGS +=
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
-preinstall:
- $(INSTALL_CHANGE) ${IMPORT_SRC} .
-
-# ${CP} ${IMPORT_SRC} .
-
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-all: ${ARCH} preinstall $(SRCS) $(PGM)
- $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
+all: ${ARCH} $(SRCS) $(PGM)
+ @$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all
diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
index c69dc7578d..06f04bee2a 100644
--- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
index 0714664f84..855fda6f0a 100644
--- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
index 96db499a02..8d14da3eb0 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
index 320a8cb8ff..c0539f0ad8 100644
--- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
+++ b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
@@ -15,11 +15,14 @@ VPATH = @srcdir@
PGM = ${ARCH}/start302.o
-ifeq ($(RTEMS_DEBUGGER),yes)
-RESET_S_PIECES = debugreset reset
-else
-CFLAGS +=
-endif
+RESET_S_PIECES_yes_V = debugreset
+RESET_S_PIECES_no_V = reset
+RESET_S_PIECES__V = $(RESET_S_PIECES_no_V)
+RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V)
+
+CFLAGS_no_V = -DGDB_MONITOR_ACTIVE
+CFLAGS__V = $(CFLAGS_no_V)
+CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V)
# C source names, if any, go here -- minus the .c
C_PIECES = cpuboot
@@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
DEFINES +=
CPPFLAGS +=
-CFLAGS +=
+CFLAGS += $(CFLAGS_V)
LD_PATHS +=
LD_LIBS +=
diff --git a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
index 320a8cb8ff..c0539f0ad8 100644
--- a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
+++ b/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
@@ -15,11 +15,14 @@ VPATH = @srcdir@
PGM = ${ARCH}/start302.o
-ifeq ($(RTEMS_DEBUGGER),yes)
-RESET_S_PIECES = debugreset reset
-else
-CFLAGS +=
-endif
+RESET_S_PIECES_yes_V = debugreset
+RESET_S_PIECES_no_V = reset
+RESET_S_PIECES__V = $(RESET_S_PIECES_no_V)
+RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V)
+
+CFLAGS_no_V = -DGDB_MONITOR_ACTIVE
+CFLAGS__V = $(CFLAGS_no_V)
+CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V)
# C source names, if any, go here -- minus the .c
C_PIECES = cpuboot
@@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
DEFINES +=
CPPFLAGS +=
-CFLAGS +=
+CFLAGS += $(CFLAGS_V)
LD_PATHS +=
LD_LIBS +=
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
index 079e905f71..2427ea6aed 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in
@@ -13,14 +13,13 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES = $
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
index 69087a68f0..cd2ca90b77 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
@@ -67,7 +67,7 @@ CLOBBER_ADDITIONS +=
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
index a470add0e4..5e65472f0f 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
@@ -53,7 +53,7 @@ LD_PATHS +=
LD_LIBS +=
LDFLAGS +=
-IMAGES : = rtems.gz
+IMAGES = rtems.gz
#
# Add your list of files to delete here. The config files
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
index a470add0e4..5e65472f0f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
@@ -53,7 +53,7 @@ LD_PATHS +=
LD_LIBS +=
LDFLAGS +=
-IMAGES : = rtems.gz
+IMAGES = rtems.gz
#
# Add your list of files to delete here. The config files
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
index b81b1ca057..0b1aa0480c 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
@@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-BSP_PIECES = startup clock console timer vectors
-# pieces to pick up out of libcpu/ppc
-CPU_PIECES =
-GENERIC_PIECES =
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
+BSP_PIECES = startup clock console timer vectors
+# pieces to pick up out of libcpu/ppc
+CPU_PIECES =
+GENERIC_PIECES =
+
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
index 6953c1ac9c..cfea59e73d 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
@@ -35,6 +35,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_RELEASE)/lib
+
+$(INSTALLDIRS):
+ @$(mkinstalldirs) $(INSTALLDIRS)
# First and second generation use different Bridge chips :(
# C source names, if any, go here -- minus the .c
@@ -69,9 +75,8 @@ CLOBBER_ADDITIONS +=
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
- $(INSTALL) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
- $(INSTALL_VARIANT) $(INSTALLED_O_FILES) $(PROJECT_RELEASE)/lib
+all: ${ARCH} $(SRCS) $(PGM)
+ $(INSTALL_CHANGE) -m 644 $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/lib/libchip/serial/Makefile.in b/c/src/lib/libchip/serial/Makefile.in
index c4d0de6181..ad0d866fb9 100644
--- a/c/src/lib/libchip/serial/Makefile.in
+++ b/c/src/lib/libchip/serial/Makefile.in
@@ -59,7 +59,7 @@ CLEAN_ADDITIONS += $(LIB)
CLOBBER_ADDITIONS +=
all: ${ARCH} preinstall $(LIB)
- $(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+ @$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
$(LIB): $(SRCS) ${OBJS}
$(make-library)
diff --git a/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
index d2c87eecf7..12c8a904e3 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
@@ -66,7 +66,7 @@ CLOBBER_ADDITIONS +=
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-preinstall:
+preinstall: $(INSTALLDIRS) $(H_FILES)
@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/libcpu
all: ${ARCH} $(SRCS) preinstall $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
index 5161a849d8..af24df43b1 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
@@ -66,7 +66,7 @@ CLOBBER_ADDITIONS +=
${PGM}: ${SRCS} ${OBJS}
$(make-rel)
-preinstall:
+preinstall: $(INSTALLDIRS) $(H_FILES)
@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/libcpu
all: ${ARCH} $(SRCS) preinstall $(PGM)
diff --git a/c/src/lib/libmisc/monitor/Makefile.in b/c/src/lib/libmisc/monitor/Makefile.in
index 284f2606e1..9b17db0604 100644
--- a/c/src/lib/libmisc/monitor/Makefile.in
+++ b/c/src/lib/libmisc/monitor/Makefile.in
@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
+
+$(INSTALLDIRS):
+ @$(mkinstalldirs) $(INSTALLDIRS)
+
LIB = ${ARCH}/libmonitor-tmp.a
# C source names, if any, go here -- minus the .c
@@ -32,17 +43,6 @@ INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h
SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
OBJS = $(C_O_FILES)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
#
# (OPTIONAL) Add local stuff here using +=
#
diff --git a/c/src/lib/libnetworking/include/Makefile.in b/c/src/lib/libnetworking/include/Makefile.in
index a6c4fffd43..7486315f39 100644
--- a/c/src/lib/libnetworking/include/Makefile.in
+++ b/c/src/lib/libnetworking/include/Makefile.in
@@ -77,16 +77,16 @@ CLOBBER_ADDITIONS +=
# We only make the install point for the networking header files if needed.
preinstall: $(INSTALLDIRS) $(SRCS)
- $(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
- $(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
- $(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
- $(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
- $(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
- $(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
- $(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
- $(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
- $(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
- $(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
+ @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
+ @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
+ @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
+ @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
+ @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
+ @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
+ @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
+ @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
+ @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
+ @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
all: preinstall
diff --git a/c/src/lib/librdbg/i386/pc386/Makefile.in b/c/src/lib/librdbg/i386/pc386/Makefile.in
index fad5be3664..9663082c39 100644
--- a/c/src/lib/librdbg/i386/pc386/Makefile.in
+++ b/c/src/lib/librdbg/i386/pc386/Makefile.in
@@ -77,7 +77,7 @@ CLOBBER_ADDITIONS +=
FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
all: ${ARCH} $(LIB)
- $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+ @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
$(LIB): $(SRCS) ${OBJS}
$(make-library)
@@ -87,7 +87,7 @@ remdeb.h: $(X_FILES)
( pwd=`pwd`; cd $(srcdir)/../..; \
$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
-o $$pwd/$@ remdeb.x )
- $(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+ @$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
remdeb_xdr.c: $(X_FILES)
@rm -f $@