From 96344c8639f8481041d51a4a32cec97ab7b84f4b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 30 Nov 1999 13:49:04 +0000
Subject: Patch rtems-rc-19991123-rc-0.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> which (among other things) converted the mptests to
 automake.

    SUB_DIRS was used instead of SUBDIRS in some Makefile.ins
    (apparently a leftover from moving the start* directories)

    Addtional major bugs:
    * psxtests/include was empty (incomplete psxtests changes).
    * bogus handling of *.scn in itrontests (screens/sptests vs.
      screens/itrontests installation dirs)

    In addition I have added a few more changes (I couldn't resist)
    * automake support for itrontests
    * OPERATION_COUNT support in tmitrontests/
    * automake support for tmitrontests
    * automake suppport for mptests
    * Some (minor) corrections to several configure.in/Makefile.ams

    => c/src/tests/ is completly under automake control, now.
    => we could start to sort out the structural issues with c/src/tests
      (tests/support, stubdr, tools, get "make dist" working)
---
 Makefile.am             | 6 ++++++
 aclocal/enable-itron.m4 | 1 -
 aclocal/enable-posix.m4 | 1 -
 make/custom/mcp750.cfg  | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0f771983d8..e29c56f737 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,15 +24,21 @@ aclocal/canonical-target-name.m4 \
 aclocal/canonicalize-tools.m4 \
 aclocal/check-bsps.m4 \
 aclocal/check-cpu.m4 \
+aclocal/check-cxx.m4 \
 aclocal/check-files-in.m4 \
+aclocal/check-itron.m4 \
 aclocal/check-makefile.m4 \
+aclocal/check-multiprocessing.m4 \
+aclocal/check-networking.m4 \
 aclocal/check-newlib.m4 \
+aclocal/check-posix.m4 \
 aclocal/check-rdbg.m4 \
 aclocal/enable-bare.m4 \
 aclocal/enable-cxx.m4 \
 aclocal/enable-gcc28.m4 \
 aclocal/enable-hwapi.m4 \
 aclocal/enable-inlines.m4 \
+aclocal/enable-itron.m4 \
 aclocal/enable-libcdir.m4 \
 aclocal/enable-multiprocessing.m4 \
 aclocal/enable-networking.m4 \
diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4
index da2bb89974..c4c8353d2b 100644
--- a/aclocal/enable-itron.m4
+++ b/aclocal/enable-itron.m4
@@ -11,7 +11,6 @@ AC_ARG_ENABLE(itron,
   no) RTEMS_HAS_ITRON_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;;
 esac],[RTEMS_HAS_ITRON_API=yes]) 
-AC_SUBST(RTEMS_HAS_ITRON_API)
 
 changequote(,)dnl
 case "${target}" in
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index 12fe119c5f..5da8110818 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -11,7 +11,6 @@ AC_ARG_ENABLE(posix,
   no) RTEMS_HAS_POSIX_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
-AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
 case "${target}" in
diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg
index 8b67279495..d8f4fa041f 100644
--- a/make/custom/mcp750.cfg
+++ b/make/custom/mcp750.cfg
@@ -99,10 +99,10 @@ CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align  -mcpu=750
 #            $(LD_LIBS) \
 #           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
 define make-exe
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
-	$(CP) $(basename $@).exe $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/mcp750/bootloader/$(ARCH); \
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
+	$(NM) -g -n $@ > $(basename $@).num
+	$(SIZE) $@
+	$(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/mcp750/bootloader/$(ARCH); \
 	cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/mcp750/bootloader; \
 	$(MAKE) bootloader BINARY_LOADED=$(basename $@).exe; \
 	COMPLETE_FILE_NAME=$(basename $@).exe ;\
-- 
cgit v1.2.3