Changeset b6529a3 in rtems

Timestamp:

04/19/99 13:35:24 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ecb2755

Parents:

183fa829

Message:

Patch from Ralf Corsepius <corsepiu@…> to reorganize
the build-tools layout to simplify it.

This script reorganizes and simpilfies the build-tools subdirectories.
It moves all source-files and scripts to c/build-tools/. This will
enable use to use this directory directly to refer to the build-tools
instead of copying them around in a "preinstall" step in future.
However, RTEMS's autoconf Makefile.ins and *.cfg files are not yet
prepared to apply this approach and therefore require additional work.

Files:

• c/build-tools/Makefile.am (modified) (1 diff)
• c/build-tools/Makefile.in (modified) (7 diffs)
• c/build-tools/configure (modified) (5 diffs)
• c/build-tools/configure.in (modified) (2 diffs)
• c/build-tools/os/Makefile.am (deleted)
• c/build-tools/os/Makefile.in (deleted)
• c/build-tools/os/msdos/Makefile.am (deleted)
• c/build-tools/os/msdos/Makefile.in (deleted)
• c/build-tools/os/msdos/README (deleted)
• c/build-tools/os/msdos/cklength.uue (deleted)
• c/build-tools/os/msdos/fixtimer.c (deleted)
• c/build-tools/os/msdos/fixtimer.uue (deleted)
• c/build-tools/os/msdos/ifc.c (deleted)
• c/build-tools/os/msdos/ifc_exe.uue (deleted)
• c/build-tools/scripts/Makefile.am (deleted)
• c/build-tools/scripts/Makefile.in (deleted)
• c/build-tools/scripts/README (deleted)
• c/build-tools/scripts/install-if-change.in (deleted)
• c/build-tools/scripts/lock-directory.in (deleted)
• c/build-tools/scripts/rcs-clean.in (deleted)
• c/build-tools/scripts/search-id.sh (deleted)
• c/build-tools/scripts/unlock-directory.in (deleted)
• c/build-tools/src/Makefile.am (deleted)
• c/build-tools/src/Makefile.in (deleted)
• c/build-tools/src/cklength.c (deleted)
• c/build-tools/src/config.h.in (deleted)
• c/build-tools/src/eolstrip.c (deleted)
• c/build-tools/src/packhex.c (deleted)
• c/build-tools/src/stamp-h.in (deleted)
• c/build-tools/src/unhex.c (deleted)
• tools/build/Makefile.am (modified) (1 diff)
• tools/build/Makefile.in (modified) (7 diffs)
• tools/build/configure (modified) (5 diffs)
• tools/build/configure.in (modified) (2 diffs)
• tools/build/os/Makefile.am (deleted)
• tools/build/os/Makefile.in (deleted)
• tools/build/os/msdos/Makefile.am (deleted)
• tools/build/os/msdos/Makefile.in (deleted)
• tools/build/os/msdos/README (deleted)
• tools/build/os/msdos/cklength.uue (deleted)
• tools/build/os/msdos/fixtimer.c (deleted)
• tools/build/os/msdos/fixtimer.uue (deleted)
• tools/build/os/msdos/ifc.c (deleted)
• tools/build/os/msdos/ifc_exe.uue (deleted)
• tools/build/scripts/Makefile.am (deleted)
• tools/build/scripts/Makefile.in (deleted)
• tools/build/scripts/README (deleted)
• tools/build/scripts/install-if-change.in (deleted)
• tools/build/scripts/lock-directory.in (deleted)
• tools/build/scripts/rcs-clean.in (deleted)
• tools/build/scripts/search-id.sh (deleted)
• tools/build/scripts/unlock-directory.in (deleted)
• tools/build/src/Makefile.am (deleted)
• tools/build/src/Makefile.in (deleted)
• tools/build/src/cklength.c (deleted)
• tools/build/src/config.h.in (deleted)
• tools/build/src/eolstrip.c (deleted)
• tools/build/src/packhex.c (deleted)
• tools/build/src/stamp-h.in (deleted)
• tools/build/src/unhex.c (deleted)

c/build-tools/Makefile.am

@@ -6 +6 @@
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = scripts src
+bin_PROGRAMS=cklength eolstrip packhex unhex
 
-include $(top_srcdir)/../../automake/subdirs.am
+cklength_SOURCES = cklength.c
+eolstrip_SOURCES = eolstrip.c
+packhex_SOURCES  = packhex.c
+unhex_SOURCES    = unhex.c
+
+bin_SCRIPTS=\
+install-if-change \
+lock-directory \
+unlock-directory \
+rcs-clean 
+
+noinst_SCRIPTS = search-id.sh
+
+#
+# HACK: Install to build directory
+#
+install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
+        if test -n "${RTEMS_BSP}"; then \
+          $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+        fi
+
+preinstall: install-exec-local
+
 include $(top_srcdir)/../../automake/local.am

c/build-tools/Makefile.in

@@ -14 +14 @@
 # $Id$
 #
-
 
 
@@ -77 +76 @@
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = scripts src
+bin_PROGRAMS = cklength eolstrip packhex unhex
+
+cklength_SOURCES = cklength.c
+eolstrip_SOURCES = eolstrip.c
+packhex_SOURCES = packhex.c
+unhex_SOURCES = unhex.c
+
+bin_SCRIPTS =  install-if-change lock-directory unlock-directory rcs-clean 
+
+
+noinst_SCRIPTS = search-id.sh
 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
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =  install-if-change lock-directory rcs-clean \
+unlock-directory
+bin_PROGRAMS =  cklength$(EXEEXT) eolstrip$(EXEEXT) packhex$(EXEEXT) \
+unhex$(EXEEXT)
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+cklength_OBJECTS =  cklength.o
+cklength_LDADD = $(LDADD)
+cklength_DEPENDENCIES = 
+cklength_LDFLAGS = 
+eolstrip_OBJECTS =  eolstrip.o
+eolstrip_LDADD = $(LDADD)
+eolstrip_DEPENDENCIES = 
+eolstrip_LDFLAGS = 
+packhex_OBJECTS =  packhex.o
+packhex_LDADD = $(LDADD)
+packhex_DEPENDENCIES = 
+packhex_LDFLAGS = 
+unhex_OBJECTS =  unhex.o
+unhex_LDADD = $(LDADD)
+unhex_DEPENDENCIES = 
+unhex_LDFLAGS = 
+SCRIPTS =  $(bin_SCRIPTS) $(noinst_SCRIPTS)
+
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  README ./stamp-h.in Makefile.am Makefile.in aclocal.m4 \
+config.h.in configure configure.in install-if-change.in \
+lock-directory.in rcs-clean.in unlock-directory.in
 
 
@@ -89 +132 @@
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/cklength.P .deps/eolstrip.P .deps/packhex.P \
+.deps/unhex.P
+SOURCES = $(cklength_SOURCES) $(eolstrip_SOURCES) $(packhex_SOURCES) $(unhex_SOURCES)
+OBJECTS = $(cklength_OBJECTS) $(eolstrip_OBJECTS) $(packhex_OBJECTS) $(unhex_OBJECTS)
+
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/subdirs.am $(top_srcdir)/../../automake/local.am
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/local.am
         cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
@@ -106 +155 @@
         cd $(srcdir) && $(AUTOCONF)
 
-# 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,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target=`echo $@ | sed s/-recursive//`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-        fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-          rev="$$subdir $$rev"; \
-          test "$$subdir" = "." && dot_seen=yes; \
-        done; \
-        test "$$dot_seen" = "no" && rev=". $$rev"; \
-        target=`echo $@ | sed s/-recursive//`; \
-        for subdir in $$rev; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done && test -z "$$fail"
-tags-recursive:
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+config.h: stamp-h
+        @if test ! -f $@; then \
+                rm -f stamp-h; \
+                $(MAKE) stamp-h; \
+        else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+        cd $(top_builddir) \
+          && CONFIG_FILES= CONFIG_HEADERS=config.h \
+             $(SHELL) ./config.status
+        @echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+        @if test ! -f $@; then \
+                rm -f $(srcdir)/stamp-h.in; \
+                $(MAKE) $(srcdir)/stamp-h.in; \
+        else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+        cd $(top_srcdir) && $(AUTOHEADER)
+        @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+        -rm -f config.h
+
+maintainer-clean-hdr:
+install-if-change: $(top_builddir)/config.status install-if-change.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+lock-directory: $(top_builddir)/config.status lock-directory.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+rcs-clean: $(top_builddir)/config.status rcs-clean.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+unlock-directory: $(top_builddir)/config.status unlock-directory.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(bindir)
+        @list='$(bin_PROGRAMS)'; for p in $$list; do \
+          if test -f $$p; then \
+            echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+             $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+          else :; fi; \
+        done
+
+uninstall-binPROGRAMS:
+        @$(NORMAL_UNINSTALL)
+        list='$(bin_PROGRAMS)'; for p in $$list; do \
+          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+        done
+
+.s.o:
+        $(COMPILE) -c $<
+
+.S.o:
+        $(COMPILE) -c $<
+
+mostlyclean-compile:
+        -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+        -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+cklength$(EXEEXT): $(cklength_OBJECTS) $(cklength_DEPENDENCIES)
+        @rm -f cklength$(EXEEXT)
+        $(LINK) $(cklength_LDFLAGS) $(cklength_OBJECTS) $(cklength_LDADD) $(LIBS)
+
+eolstrip$(EXEEXT): $(eolstrip_OBJECTS) $(eolstrip_DEPENDENCIES)
+        @rm -f eolstrip$(EXEEXT)
+        $(LINK) $(eolstrip_LDFLAGS) $(eolstrip_OBJECTS) $(eolstrip_LDADD) $(LIBS)
+
+packhex$(EXEEXT): $(packhex_OBJECTS) $(packhex_DEPENDENCIES)
+        @rm -f packhex$(EXEEXT)
+        $(LINK) $(packhex_LDFLAGS) $(packhex_OBJECTS) $(packhex_LDADD) $(LIBS)
+
+unhex$(EXEEXT): $(unhex_OBJECTS) $(unhex_DEPENDENCIES)
+        @rm -f unhex$(EXEEXT)
+        $(LINK) $(unhex_LDFLAGS) $(unhex_OBJECTS) $(unhex_LDADD) $(LIBS)
+
+install-binSCRIPTS: $(bin_SCRIPTS)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(bindir)
+        @list='$(bin_SCRIPTS)'; for p in $$list; do \
+          if test -f $$p; then \
+            echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+            $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+          else if test -f $(srcdir)/$$p; then \
+            echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+            $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+          else :; fi; fi; \
+        done
+
+uninstall-binSCRIPTS:
+        @$(NORMAL_UNINSTALL)
+        list='$(bin_SCRIPTS)'; for p in $$list; do \
+          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
         done
 
@@ -171 +277 @@
           && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
         tags=; \
         here=`pwd`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-        done; \
         list='$(SOURCES) $(HEADERS)'; \
         unique=`for i in $$list; do echo $$i; done | \
           awk '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+        test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
@@ -248 +349 @@
           fi; \
         done
-        for subdir in $(SUBDIRS); do \
-          if test "$$subdir" = .; then :; else \
-            test -d $(distdir)/$$subdir \
-            || mkdir $(distdir)/$$subdir \
-            || exit 1; \
-            chmod 777 $(distdir)/$$subdir; \
-            (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-              || exit 1; \
-          fi; \
-        done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+        -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+        @echo '$(COMPILE) -c $<'; \
+        $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-cp .deps/$(*F).pp .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm .deps/$(*F).pp
+
+%.lo: %.c
+        @echo '$(LTCOMPILE) -c $<'; \
+        $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
+          < .deps/$(*F).pp > .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm -f .deps/$(*F).pp
 info-am:
-info: info-recursive
+info: info-am
 dvi-am:
-dvi: dvi-recursive
+dvi: dvi-am
 check-am: all-am
-check: check-recursive
+check: check-am
 installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+installcheck: installcheck-am
+all-recursive-am: config.h
+        $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+                install-exec-local
+install-exec: install-exec-am
 
 install-data-am:
-install-data: install-data-recursive
+install-data: install-data-am
 
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
+install: install-am
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
+uninstall: uninstall-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h
+all-redirect: all-am
 install-strip:
         $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
+installdirs:
+        $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
 
 
@@ -294 +421 @@
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
+mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
+                mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+                mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
+                clean-depend clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
+                distclean-tags distclean-depend distclean-generic \
+                clean-am
+
+distclean: distclean-am
         -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+                maintainer-clean-compile maintainer-clean-tags \
+                maintainer-clean-depend 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
+maintainer-clean: maintainer-clean-am
         -rm -f config.status
 
-.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 \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS 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 all-recursive-am 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
 
 
-preinstall-recursive \
-debug-recursive debug_install-recursive \
-profile-recursive profile_install-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target=`echo $@ | sed s/-recursive//`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-        fi; test -z "$$fail"
-
-debug: debug-recursive
-
-debug_install: debug_install-recursive
-
-profile: profile-recursive
-
-profile_install: profile_install-recursive
-
-preinstall: preinstall-recursive
-
-.PHONY: \
-debug debug-recursive \
-debug_install \
-profile profile-recursive \
-profile_install \
-preinstall preinstall-recursive
+#
+# HACK: Install to build directory
+#
+install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
+        if test -n "${RTEMS_BSP}"; then \
+          $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+        fi
+
+preinstall: install-exec-local
 
 debug-am:

c/build-tools/configure

@@ -454 +454 @@
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=scripts
+ac_unique_file=README
 
 # Find the source files, if location was not specified.
@@ -1358 +1358 @@
 
 trap 'rm -fr `echo "Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
- src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
+ config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1460 +1458 @@
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
 "}
 EOF
@@ -1547 +1543 @@
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="src/config.h"
+  CONFIG_HEADERS="config.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -1638 +1634 @@
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > src/stamp-h
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 
 exit 0

c/build-tools/configure.in

@@ -4 +4 @@
 
 AC_PREREQ(2.13)
-AC_INIT(scripts)
+AC_INIT(README)
 AC_CONFIG_AUX_DIR(../..)
 RTEMS_TOP(../..)
@@ -18 +18 @@
 RTEMS_PATH_KSH
 
-AM_CONFIG_HEADER(src/config.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
 Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
 )

tools/build/Makefile.am

@@ -6 +6 @@
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = scripts src
+bin_PROGRAMS=cklength eolstrip packhex unhex
 
-include $(top_srcdir)/../../automake/subdirs.am
+cklength_SOURCES = cklength.c
+eolstrip_SOURCES = eolstrip.c
+packhex_SOURCES  = packhex.c
+unhex_SOURCES    = unhex.c
+
+bin_SCRIPTS=\
+install-if-change \
+lock-directory \
+unlock-directory \
+rcs-clean 
+
+noinst_SCRIPTS = search-id.sh
+
+#
+# HACK: Install to build directory
+#
+install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
+        if test -n "${RTEMS_BSP}"; then \
+          $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+        fi
+
+preinstall: install-exec-local
+
 include $(top_srcdir)/../../automake/local.am

tools/build/Makefile.in

@@ -14 +14 @@
 # $Id$
 #
-
 
 
@@ -77 +76 @@
 ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = scripts src
+bin_PROGRAMS = cklength eolstrip packhex unhex
+
+cklength_SOURCES = cklength.c
+eolstrip_SOURCES = eolstrip.c
+packhex_SOURCES = packhex.c
+unhex_SOURCES = unhex.c
+
+bin_SCRIPTS =  install-if-change lock-directory unlock-directory rcs-clean 
+
+
+noinst_SCRIPTS = search-id.sh
 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
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =  install-if-change lock-directory rcs-clean \
+unlock-directory
+bin_PROGRAMS =  cklength$(EXEEXT) eolstrip$(EXEEXT) packhex$(EXEEXT) \
+unhex$(EXEEXT)
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+cklength_OBJECTS =  cklength.o
+cklength_LDADD = $(LDADD)
+cklength_DEPENDENCIES = 
+cklength_LDFLAGS = 
+eolstrip_OBJECTS =  eolstrip.o
+eolstrip_LDADD = $(LDADD)
+eolstrip_DEPENDENCIES = 
+eolstrip_LDFLAGS = 
+packhex_OBJECTS =  packhex.o
+packhex_LDADD = $(LDADD)
+packhex_DEPENDENCIES = 
+packhex_LDFLAGS = 
+unhex_OBJECTS =  unhex.o
+unhex_LDADD = $(LDADD)
+unhex_DEPENDENCIES = 
+unhex_LDFLAGS = 
+SCRIPTS =  $(bin_SCRIPTS) $(noinst_SCRIPTS)
+
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  README ./stamp-h.in Makefile.am Makefile.in aclocal.m4 \
+config.h.in configure configure.in install-if-change.in \
+lock-directory.in rcs-clean.in unlock-directory.in
 
 
@@ -89 +132 @@
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/cklength.P .deps/eolstrip.P .deps/packhex.P \
+.deps/unhex.P
+SOURCES = $(cklength_SOURCES) $(eolstrip_SOURCES) $(packhex_SOURCES) $(unhex_SOURCES)
+OBJECTS = $(cklength_OBJECTS) $(eolstrip_OBJECTS) $(packhex_OBJECTS) $(unhex_OBJECTS)
+
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/subdirs.am $(top_srcdir)/../../automake/local.am
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/local.am
         cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
@@ -106 +155 @@
         cd $(srcdir) && $(AUTOCONF)
 
-# 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,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target=`echo $@ | sed s/-recursive//`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-        fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-          rev="$$subdir $$rev"; \
-          test "$$subdir" = "." && dot_seen=yes; \
-        done; \
-        test "$$dot_seen" = "no" && rev=". $$rev"; \
-        target=`echo $@ | sed s/-recursive//`; \
-        for subdir in $$rev; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done && test -z "$$fail"
-tags-recursive:
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+config.h: stamp-h
+        @if test ! -f $@; then \
+                rm -f stamp-h; \
+                $(MAKE) stamp-h; \
+        else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+        cd $(top_builddir) \
+          && CONFIG_FILES= CONFIG_HEADERS=config.h \
+             $(SHELL) ./config.status
+        @echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+        @if test ! -f $@; then \
+                rm -f $(srcdir)/stamp-h.in; \
+                $(MAKE) $(srcdir)/stamp-h.in; \
+        else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+        cd $(top_srcdir) && $(AUTOHEADER)
+        @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+        -rm -f config.h
+
+maintainer-clean-hdr:
+install-if-change: $(top_builddir)/config.status install-if-change.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+lock-directory: $(top_builddir)/config.status lock-directory.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+rcs-clean: $(top_builddir)/config.status rcs-clean.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+unlock-directory: $(top_builddir)/config.status unlock-directory.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(bindir)
+        @list='$(bin_PROGRAMS)'; for p in $$list; do \
+          if test -f $$p; then \
+            echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+             $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+          else :; fi; \
+        done
+
+uninstall-binPROGRAMS:
+        @$(NORMAL_UNINSTALL)
+        list='$(bin_PROGRAMS)'; for p in $$list; do \
+          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+        done
+
+.s.o:
+        $(COMPILE) -c $<
+
+.S.o:
+        $(COMPILE) -c $<
+
+mostlyclean-compile:
+        -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+        -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+cklength$(EXEEXT): $(cklength_OBJECTS) $(cklength_DEPENDENCIES)
+        @rm -f cklength$(EXEEXT)
+        $(LINK) $(cklength_LDFLAGS) $(cklength_OBJECTS) $(cklength_LDADD) $(LIBS)
+
+eolstrip$(EXEEXT): $(eolstrip_OBJECTS) $(eolstrip_DEPENDENCIES)
+        @rm -f eolstrip$(EXEEXT)
+        $(LINK) $(eolstrip_LDFLAGS) $(eolstrip_OBJECTS) $(eolstrip_LDADD) $(LIBS)
+
+packhex$(EXEEXT): $(packhex_OBJECTS) $(packhex_DEPENDENCIES)
+        @rm -f packhex$(EXEEXT)
+        $(LINK) $(packhex_LDFLAGS) $(packhex_OBJECTS) $(packhex_LDADD) $(LIBS)
+
+unhex$(EXEEXT): $(unhex_OBJECTS) $(unhex_DEPENDENCIES)
+        @rm -f unhex$(EXEEXT)
+        $(LINK) $(unhex_LDFLAGS) $(unhex_OBJECTS) $(unhex_LDADD) $(LIBS)
+
+install-binSCRIPTS: $(bin_SCRIPTS)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(bindir)
+        @list='$(bin_SCRIPTS)'; for p in $$list; do \
+          if test -f $$p; then \
+            echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+            $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+          else if test -f $(srcdir)/$$p; then \
+            echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+            $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+          else :; fi; fi; \
+        done
+
+uninstall-binSCRIPTS:
+        @$(NORMAL_UNINSTALL)
+        list='$(bin_SCRIPTS)'; for p in $$list; do \
+          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
         done
 
@@ -171 +277 @@
           && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
         tags=; \
         here=`pwd`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-        done; \
         list='$(SOURCES) $(HEADERS)'; \
         unique=`for i in $$list; do echo $$i; done | \
           awk '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+        test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+          || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
@@ -248 +349 @@
           fi; \
         done
-        for subdir in $(SUBDIRS); do \
-          if test "$$subdir" = .; then :; else \
-            test -d $(distdir)/$$subdir \
-            || mkdir $(distdir)/$$subdir \
-            || exit 1; \
-            chmod 777 $(distdir)/$$subdir; \
-            (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-              || exit 1; \
-          fi; \
-        done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+        -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+        @echo '$(COMPILE) -c $<'; \
+        $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-cp .deps/$(*F).pp .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm .deps/$(*F).pp
+
+%.lo: %.c
+        @echo '$(LTCOMPILE) -c $<'; \
+        $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
+          < .deps/$(*F).pp > .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm -f .deps/$(*F).pp
 info-am:
-info: info-recursive
+info: info-am
 dvi-am:
-dvi: dvi-recursive
+dvi: dvi-am
 check-am: all-am
-check: check-recursive
+check: check-am
 installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+installcheck: installcheck-am
+all-recursive-am: config.h
+        $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+                install-exec-local
+install-exec: install-exec-am
 
 install-data-am:
-install-data: install-data-recursive
+install-data: install-data-am
 
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
+install: install-am
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
+uninstall: uninstall-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h
+all-redirect: all-am
 install-strip:
         $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
+installdirs:
+        $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
 
 
@@ -294 +421 @@
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
+mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
+                mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+                mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
+                clean-depend clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
+                distclean-tags distclean-depend distclean-generic \
+                clean-am
+
+distclean: distclean-am
         -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+                maintainer-clean-compile maintainer-clean-tags \
+                maintainer-clean-depend 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
+maintainer-clean: maintainer-clean-am
         -rm -f config.status
 
-.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 \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS 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 all-recursive-am 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
 
 
-preinstall-recursive \
-debug-recursive debug_install-recursive \
-profile-recursive profile_install-recursive:
-        @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target=`echo $@ | sed s/-recursive//`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-        fi; test -z "$$fail"
-
-debug: debug-recursive
-
-debug_install: debug_install-recursive
-
-profile: profile-recursive
-
-profile_install: profile_install-recursive
-
-preinstall: preinstall-recursive
-
-.PHONY: \
-debug debug-recursive \
-debug_install \
-profile profile-recursive \
-profile_install \
-preinstall preinstall-recursive
+#
+# HACK: Install to build directory
+#
+install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
+        if test -n "${RTEMS_BSP}"; then \
+          $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+          $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
+        fi
+
+preinstall: install-exec-local
 
 debug-am:

tools/build/configure

@@ -454 +454 @@
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=scripts
+ac_unique_file=README
 
 # Find the source files, if location was not specified.
@@ -1358 +1358 @@
 
 trap 'rm -fr `echo "Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
- src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
+ config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1460 +1458 @@
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
 "}
 EOF
@@ -1547 +1543 @@
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="src/config.h"
+  CONFIG_HEADERS="config.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -1638 +1634 @@
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > src/stamp-h
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 
 exit 0

tools/build/configure.in

@@ -4 +4 @@
 
 AC_PREREQ(2.13)
-AC_INIT(scripts)
+AC_INIT(README)
 AC_CONFIG_AUX_DIR(../..)
 RTEMS_TOP(../..)
@@ -18 +18 @@
 RTEMS_PATH_KSH
 
-AM_CONFIG_HEADER(src/config.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
 Makefile
-src/Makefile
-scripts/Makefile
-scripts/install-if-change
-scripts/lock-directory
-scripts/rcs-clean
-scripts/unlock-directory
+install-if-change
+lock-directory
+rcs-clean
+unlock-directory
 )