Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

  This patch is an addition to "The big-patch"

  CHANGES:
  * FIX: c/Makefile.am: bogus comment which changed the behavior of
    c/Makefile.am removed
  * FIX: make/custom/ts_i386ex.cfg did not set HAS_NETWORKING correctly
    (Me thinks it might have been me who added this bogus setting :-).

  * NEW: removing make targets get, protos, debug_install, profile_install

  * NEW: replacing clobber with distclean
  * NEW: Reimplement distclean and clean as reverse depth first make
    targets (adaptation to automake's behavior)
  * NEW: removing RCS_CLEAN from make distclean (tools/build/rcs_clean is
    still in - remove it?)
  * NEW: "$(RM) Makefile" added to make distclean (adaptation to
    automake's behavior)
  * NEW: "$(RM) config.cache config.log" to CLOBBER_ADDITIONS in
    [lib|exec|tests]/Makefile.in (adaptation to automake's behavior)
  * NEW: "$(CLEAN_PROTOS)" removed (Not used anywhere)
  * NEW: binpatch.c moved from i386 bsp tools to tools/build (AFAIS,
    binpatch is not specific to the pc386 BSP at all)
  * NEW: AC_EXEEXT added to all configure scripts which contain AC_PROG_CC
    (Cygwin support)

  * NEW/Experimental: An experimental implementation of temporary
    installation tree support in libbsp/i386/pc386/tools/Makefile.am, based
    on dependency tracking with make, instead of applying INSTALL_CHANGE.


  REMARK:
  * This patch is small in size, but changes the behavior of "make
    clean|distclean|clobber" basically.
  * This patch does not alter building/compiling RTEMS, ie. there should
    be no need to rerun all "make all" building tests.

  KNOWN BUGS:
  * make RTEMS_BSP="..." distclean in c/ runs "make distclean" in BSPs
    subdirectories passed through RTEMS_BSP and in "c/." only, but does not
    descend into other BSP subdirectories previously configured with
    different settings of make RTEMS_BSP="...".
    => Workaround: always use the same setting of RTEMS_BSP when working
    inside the build-tree.

  * "make [distclean|clean]" do not clean subdirectories, which have been
    configured at configuration time, but  which are not used due to
    make-time configuration (e.g. macros/networking/rdgb subdirectories).
    This will problem will vanish by itself when migrating from make-time to
    configuration-time configuration

  APPLYING THE PATCH

      mv c/src/lib/libbsp/i386/pc386/tools/binpatch.c tools/build
      patch -p1 < rtems-rc-19990709-2.diff
      autogen

1 files changed, 25 insertions, 41 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in
index a003c6fd50..16e15579d6 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.in
@@ -69,6 +69,7 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 CC = @CC@
+EXEEXT = @EXEEXT@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -91,14 +92,17 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 EXTRA_DIST = Spec.doc
 
-noinst_PROGRAMS =  bin2boot binpatch
+noinst_PROGRAMS =  bin2boot
 
 
 bin2boot_SOURCES = bin2boot.c
-binpatch_SOURCES = binpatch.c
+
+PREINSTALL_DIRS = $(PROJECT_ROOT)/pc386/build-tools
+PREINSTALL_FILES = $(PROJECT_ROOT)/pc386/build-tools/bin2boot
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
 CONFIG_CLEAN_FILES = 
+noinst_PROGRAMS =  bin2boot$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)
 
 
@@ -110,10 +114,6 @@ bin2boot_OBJECTS =  bin2boot.o
 bin2boot_LDADD = $(LDADD)
 bin2boot_DEPENDENCIES = 
 bin2boot_LDFLAGS = 
-binpatch_OBJECTS =  binpatch.o
-binpatch_LDADD = $(LDADD)
-binpatch_DEPENDENCIES = 
-binpatch_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -125,9 +125,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/bin2boot.P .deps/binpatch.P
-SOURCES = $(bin2boot_SOURCES) $(binpatch_SOURCES)
-OBJECTS = $(bin2boot_OBJECTS) $(binpatch_OBJECTS)
+DEP_FILES =  .deps/bin2boot.P
+SOURCES = $(bin2boot_SOURCES)
+OBJECTS = $(bin2boot_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -172,14 +172,10 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-bin2boot: $(bin2boot_OBJECTS) $(bin2boot_DEPENDENCIES)
-	@rm -f bin2boot
+bin2boot$(EXEEXT): $(bin2boot_OBJECTS) $(bin2boot_DEPENDENCIES)
+	@rm -f bin2boot$(EXEEXT)
 	$(LINK) $(bin2boot_LDFLAGS) $(bin2boot_OBJECTS) $(bin2boot_LDADD) $(LIBS)
 
-binpatch: $(binpatch_OBJECTS) $(binpatch_DEPENDENCIES)
-	@rm -f binpatch
-	$(LINK) $(binpatch_LDFLAGS) $(binpatch_OBJECTS) $(binpatch_LDADD) $(LIBS)
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -302,7 +298,7 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-exec-am: install-exec-local
+install-exec-am:
 install-exec: install-exec-am
 
 install-data-am:
@@ -313,7 +309,7 @@ install-am: all-am
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) all-local
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -361,46 +357,34 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir mostlyclean-depend \
 distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-local install-exec-am install-exec install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-local all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-# HACK: install into build-tree
-preinstall: install-exec-local
+$(PREINSTALL_DIRS):
+	$(mkinstalldirs) $@
+
+$(PROJECT_ROOT)/pc386/build-tools/bin2boot: bin2boot
+	$(INSTALL_PROGRAM) $< $@
 
-install-exec-local: $(PROGRAMS)
-	$(mkinstalldirs) $(PROJECT_ROOT)/pc386/build-tools
-	$(INSTALL_PROGRAM) bin2boot $(PROJECT_ROOT)/pc386/build-tools
-	$(INSTALL_PROGRAM) binpatch $(PROJECT_ROOT)/pc386/build-tools
+# HACK: install into build-tree
+all-local: $(PREINSTALL_DIRS) $(PREINSTALL_FILES)
 
 debug-am:
 debug: debug-am
 .PHONY: debug debug-am
 
-debug_install-am:
-debug_install: debug_install-am
-.PHONY: debug_install debug_install-am
-
 profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-profile_install-am:
-profile_install: profile_install-am
-.PHONY: profile_install profile_install-am
-
 preinstall-am:
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 
-clobber-am:
-clobber: clobber-am
-.PHONY: clobber clobber-am
-
 depend-am:
 depend: depend-am
 .PHONY: depend depend-am