summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-26 21:26:44 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-26 21:26:44 +0000
commit29e68b75843aa889a15ca8dcfff1cd30fea9e963 (patch)
tree21c6b34565dc7c7e0a7125f0ec71a42b0a3a142c
parent08b5f55b6fd9c12c91a4d99219723b88e6c860d5 (diff)
downloadrtems-29e68b75843aa889a15ca8dcfff1cd30fea9e963.tar.bz2
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
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in28
-rw-r--r--automake/local.am12
-rw-r--r--automake/subdirs.am14
-rw-r--r--c/Makefile.am8
-rw-r--r--c/Makefile.in29
-rw-r--r--c/src/Makefile.in26
-rw-r--r--c/src/exec/Makefile.in2
-rw-r--r--c/src/exec/sapi/include/rtems/Makefile.in2
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.in2
-rw-r--r--c/src/lib/Makefile.in2
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in18
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/configure122
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in1
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/Makefile.am20
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/Makefile.in66
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/bin2boot.c9
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/binpatch.c168
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/configure124
-rw-r--r--c/src/lib/libbsp/i386/pc386/tools/configure.in3
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in26
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in12
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in14
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in18
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/configure168
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/configure.in1
-rw-r--r--c/src/lib/libbsp/powerpc/psim/tools/Makefile.in12
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/Makefile.in12
-rw-r--r--c/src/lib/libbsp/unix/posix/tools/Makefile.in12
-rw-r--r--c/src/make/Makefile.in26
-rw-r--r--c/src/make/README9
-rw-r--r--c/src/make/Templates/Makefile.in12
-rw-r--r--c/src/make/compilers/Makefile.in12
-rw-r--r--c/src/make/custom/Makefile.in12
-rw-r--r--c/src/make/directory.cfg35
-rw-r--r--c/src/make/main.cfg.in17
-rw-r--r--c/src/tests/Makefile.in2
-rw-r--r--c/src/tests/tools/generic/Makefile.in12
-rw-r--r--doc/Makefile.in12
-rw-r--r--make/Makefile.in26
-rw-r--r--make/README9
-rw-r--r--make/Templates/Makefile.in12
-rw-r--r--make/compilers/Makefile.in12
-rw-r--r--make/custom/Makefile.in12
-rw-r--r--make/custom/ts_386ex.cfg4
-rw-r--r--make/directory.cfg35
-rw-r--r--make/leaf.cfg36
-rw-r--r--make/main.cfg17
-rw-r--r--tools/Makefile.in26
-rw-r--r--tools/build/Makefile.am5
-rw-r--r--tools/build/Makefile.in60
-rw-r--r--tools/build/binpatch.c12
-rw-r--r--tools/build/config.h.in3
-rw-r--r--tools/build/configure2
-rw-r--r--tools/build/configure.in2
-rw-r--r--tools/cpu/Makefile.in26
-rw-r--r--tools/cpu/generic/Makefile.in12
-rw-r--r--tools/cpu/hppa1.1/configure116
-rw-r--r--tools/cpu/hppa1.1/configure.in1
-rw-r--r--tools/cpu/sh/Makefile.in18
-rw-r--r--tools/cpu/sh/configure122
-rw-r--r--tools/cpu/sh/configure.in1
-rw-r--r--tools/cpu/unix/Makefile.in18
-rw-r--r--tools/cpu/unix/configure116
-rw-r--r--tools/cpu/unix/configure.in1
-rw-r--r--tools/update/Makefile.in12
66 files changed, 921 insertions, 877 deletions
diff --git a/Makefile.am b/Makefile.am
index ef248747b7..5a9b46e86b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-SUBDIRS = make tools @TARGET_SUBDIRS@
+SUBDIRS = doc make tools @TARGET_SUBDIRS@
AUTOMAKE_FILES = \
automake/subdirs.am \
diff --git a/Makefile.in b/Makefile.in
index 2d07bde627..70e44dfd49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,7 @@ target_subdirs = @target_subdirs@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-SUBDIRS = make tools @TARGET_SUBDIRS@
+SUBDIRS = doc make tools @TARGET_SUBDIRS@
AUTOMAKE_FILES = automake/subdirs.am automake/local.am
@@ -364,12 +364,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(ACLOCAL_FILES)
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -391,21 +388,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -413,26 +401,14 @@ 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
diff --git a/automake/local.am b/automake/local.am
index c7c5f26b95..5d50b69087 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -9,26 +9,14 @@ 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
diff --git a/automake/subdirs.am b/automake/subdirs.am
index a60f1f37ba..dfca504623 100644
--- a/automake/subdirs.am
+++ b/automake/subdirs.am
@@ -8,12 +8,9 @@
## and this file will probably be removed
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -37,20 +34,11 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
diff --git a/c/Makefile.am b/c/Makefile.am
index 565f345917..3f62704966 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -2,6 +2,10 @@
# $Id$
#
+## NOTE: This Makefile.am is rather fragile to the value of RTEMS_BSP
+## Esp. make clean and make distclean have unwanted side-effects
+## if RTEMS_BSP is not properly set up.
+
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
@@ -12,11 +16,11 @@ SUBDIRS= \
. \
$(RTEMS_BSP)
+
## Use @RTEMS_BSP_LIST@ here, using $(RTEMS_BSP_LIST) would trigger
## this rule for invalid BSPs
@RTEMS_BSP_LIST@: src/configure
@set fnord $(MAKEFLAGS); amf=$$2; \
- # Adjust paths
test -n "${RTEMS_BSP}" && for i in ${RTEMS_BSP}; do \
echo "Configuring RTEMS_BSP=$$i"; \
test -d $$i || mkdir $$i; \
@@ -29,9 +33,7 @@ $(RTEMS_BSP)
## Let all RTEMS' make targets depend on ${RTEMS_BSP}
all-am: ${RTEMS_BSP}
debug-am: ${RTEMS_BSP}
-debug_install-am: ${RTEMS_BSP}
profile-am: ${RTEMS_BSP}
-profile_install-am: ${RTEMS_BSP}
preinstall-am: ${RTEMS_BSP}
depend-am: ${RTEMS_BSP}
diff --git a/c/Makefile.in b/c/Makefile.in
index 1248d61a21..c9b5befcbc 100644
--- a/c/Makefile.in
+++ b/c/Makefile.in
@@ -343,7 +343,6 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
@RTEMS_BSP_LIST@: src/configure
@set fnord $(MAKEFLAGS); amf=$$2; \
- # Adjust paths
test -n "${RTEMS_BSP}" && for i in ${RTEMS_BSP}; do \
echo "Configuring RTEMS_BSP=$$i"; \
test -d $$i || mkdir $$i; \
@@ -355,19 +354,14 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
all-am: ${RTEMS_BSP}
debug-am: ${RTEMS_BSP}
-debug_install-am: ${RTEMS_BSP}
profile-am: ${RTEMS_BSP}
-profile_install-am: ${RTEMS_BSP}
preinstall-am: ${RTEMS_BSP}
depend-am: ${RTEMS_BSP}
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -389,21 +383,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -411,26 +396,14 @@ 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
diff --git a/c/src/Makefile.in b/c/src/Makefile.in
index 028423299f..455bae76e7 100644
--- a/c/src/Makefile.in
+++ b/c/src/Makefile.in
@@ -348,12 +348,9 @@ install-data-local:
tar cf - @RTEMS_BSP@/[bilsuM]* | (cd $(prefix); tar xpBf - );
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -375,21 +372,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -397,26 +385,14 @@ 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
diff --git a/c/src/exec/Makefile.in b/c/src/exec/Makefile.in
index 4876b579f9..80ee6af6ba 100644
--- a/c/src/exec/Makefile.in
+++ b/c/src/exec/Makefile.in
@@ -22,6 +22,8 @@ POSIX_DIRS = $(POSIX_DIRS_$(HAS_POSIX_API)_V)
SUB_DIRS = score rtems $(POSIX_DIRS) sapi wrapup
+CLOBBER_ADDITIONS += config.log config.cache
+
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
index 68d513f627..affb749384 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ b/c/src/exec/sapi/include/rtems/Makefile.in
@@ -37,7 +37,7 @@ $(INSTALLDIRS):
#
CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
+CLOBBER_ADDITIONS += sptables.h
all: preinstall
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index 415ac2601f..c8c24d01da 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/Makefile.in
@@ -87,7 +87,7 @@ $(TARGOPTS):
else \
echo "#define USE_INLINES 1" >>$@; \
fi
- if test "$(HAS_MP)" = "yes"; then \
+ @if test "$(HAS_MP)" = "yes"; then \
echo "#define RTEMS_MULTIPROCESSING 1" >>$@; \
fi
@if test "$(HAS_POSIX_API)" = "yes"; then \
diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in
index 488585802c..638185babc 100644
--- a/c/src/lib/Makefile.in
+++ b/c/src/lib/Makefile.in
@@ -41,6 +41,8 @@ LIBHWAPI = $(wildcard libhwapi)
SUB_DIRS = start include libmisc libc $(LIBNETWORKING) libcpu libbsp \
$(LIBRPC) $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
+CLOBBER_ADDITIONS += config.log config.cache
+
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in
index d84b80e387..e45f2ec830 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/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@
@@ -98,6 +99,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = print_dump$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -196,8 +198,8 @@ distclean-compile:
maintainer-clean-compile:
-print_dump: $(print_dump_OBJECTS) $(print_dump_DEPENDENCIES)
- @rm -f print_dump
+print_dump$(EXEEXT): $(print_dump_OBJECTS) $(print_dump_DEPENDENCIES)
+ @rm -f print_dump$(EXEEXT)
$(LINK) $(print_dump_LDFLAGS) $(print_dump_OBJECTS) $(print_dump_LDADD) $(LIBS)
tags: TAGS
@@ -405,26 +407,14 @@ 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
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure
index 868d8e117b..6ac6973a7d 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1164,12 +1259,12 @@ fi
for ac_func in strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1168: checking for $ac_func" >&5
+echo "configure:1263: 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 1173 "configure"
+#line 1268 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1192,7 +1287,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1291: \"$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
@@ -1424,6 +1519,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
s%@RTEMS_ROOT@%$RTEMS_ROOT%g
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in
index 02339d79b1..66a415848a 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in
@@ -10,6 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-lib-libbsp-hppa-simhppa-tools,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
diff --git a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
index 35c8285fc7..f5c023de4b 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am
@@ -8,18 +8,20 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
EXTRA_DIST = Spec.doc
noinst_PROGRAMS = \
-bin2boot \
-binpatch
+bin2boot
bin2boot_SOURCES = bin2boot.c
-binpatch_SOURCES = binpatch.c
-# HACK: install into build-tree
-preinstall: install-exec-local
+PREINSTALL_DIRS=$(PROJECT_ROOT)/pc386/build-tools
+PREINSTALL_FILES = $(PROJECT_ROOT)/pc386/build-tools/bin2boot
+
+$(PREINSTALL_DIRS):
+ $(mkinstalldirs) $@
-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
+$(PROJECT_ROOT)/pc386/build-tools/bin2boot: bin2boot
+ $(INSTALL_PROGRAM) $< $@
+
+# HACK: install into build-tree
+all-local: $(PREINSTALL_DIRS) $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../../../../automake/local.am
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
diff --git a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c
index 170452c232..af614e10e2 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c
+++ b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c
@@ -403,12 +403,3 @@ writeHeader:
return 0;
}
-
-
-
-
-
-
-
-
-
diff --git a/c/src/lib/libbsp/i386/pc386/tools/binpatch.c b/c/src/lib/libbsp/i386/pc386/tools/binpatch.c
deleted file mode 100644
index ab0900702a..0000000000
--- a/c/src/lib/libbsp/i386/pc386/tools/binpatch.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * $Id$
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * This function will patch binary file
- */
-
-
-static char buf[512];
-
-static void
-usage(void)
-{
- printf("usage: binpatch [-h] <ofile> <ifile> <reloc> <off> <byte0> "
- "[<byte1> [<byte2> [<byte3>]]]\n");
- printf("this function patches binary file at specified offset with\n");
- printf("up to 4 bytes provided on command line \n");
- printf("-h - prints this message\n\n");
- printf("<ofile> - output file\n");
- printf("<ifile> - input ifile\n");
- printf("<reloc> - relocation address of image\n");
- printf("<off> - offset of patch, offset in file is at off - reloc\n");
- printf("<byte0> - byte 0 of patch\n");
- printf("<byte1> - byte 1 of patch\n");
- printf("<byte2> - byte 1 of patch\n");
- printf("<byte3> - byte 1 of patch\n");
-
- return;
-}
-
-int
-main(int argc, char **argv)
-{
- int c;
- FILE *ofp, *ifp;
- char patch[4], *end;
- int patchLen, tmp, i, off, cnt, patched, len, reloc;
-
-
- /* parse command line options */
- while ((c = getopt(argc, argv, "h")) >= 0)
- {
- switch (c)
- {
- case 'h':
- usage();
- return 0;
- default:
- usage();
- return 1;
- }
- }
-
- if(argc < 6)
- {
- usage();
- return 1;
- }
-
- /* Let us get offset in file */
- reloc = strtol(argv[3], &end, 0);
- if(end == argv[3] || off < 0)
- {
- fprintf(stderr, "bad reloc value %s\n", argv[3]);
- return 1;
- }
-
- off = strtol(argv[4], &end, 0);
- if(end == argv[4] || off < 0 || off < reloc)
- {
- fprintf(stderr, "bad offset value %s\n", argv[4]);
- return 1;
- }
-
- off -= reloc;
-
- /* Let us get patch */
- patchLen = argc - 5;
-
- for(i=0; i<patchLen; i++)
- {
- tmp = strtol(argv[5+i], &end, 0);
-
- if(end == argv[4+i] || tmp < 0 || tmp > 0xff)
- {
- fprintf(stderr, "bad byte value %s\n", argv[5+i]);
- return 1;
- }
- patch[i] = tmp;
- }
-
- ifp = fopen(argv[2], "r");
- if(ifp == NULL)
- {
- fprintf(stderr, "unable to open file %s\n", argv[2]);
- return 1;
- }
-
- ofp = fopen(argv[1], "w");
- if(ofp == NULL)
- {
- fprintf(stderr, "unable to open file %s\n", argv[1]);
- return 1;
- }
-
- cnt = 0;
- patched = 0;
- for(;;)
- {
- len = fread(buf, 1, sizeof(buf), ifp);
-
- if(len == 0)
- {
- break;
- }
-
- if(cnt <= off && (cnt + len) > off)
- {
- /* Perform patch */
- for(i=0; i<patchLen && (off+i)<(cnt+len); i++)
- {
- buf[off-cnt+i] = patch[i];
- }
- patched = 1;
- }
- else if(cnt > off && cnt < (off + patchLen))
- {
- /* Perform patch */
- for(i=cnt-off; i<patchLen; i++)
- {
- buf[off-cnt+i] = patch[i];
- }
- patched = 1;
- }
-
- fwrite(buf, 1, len, ofp);
-
- cnt += len;
- }
-
- fclose(ifp);
- fclose(ofp);
-
- if(!patched)
- {
- fprintf(stderr, "warning: offset is beyond input file length\n");
- fprintf(stderr, " no patch is performed\n");
- }
-
- return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure b/c/src/lib/libbsp/i386/pc386/tools/configure
index c3c9011f64..6d439a5f9a 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1161,15 +1256,15 @@ else
fi
-for ac_func in strtol strtoul
+for ac_func in strtoul
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1168: checking for $ac_func" >&5
+echo "configure:1263: 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 1173 "configure"
+#line 1268 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1192,7 +1287,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1291: \"$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
@@ -1433,6 +1528,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
s%@RTEMS_ROOT@%$RTEMS_ROOT%g
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.in b/c/src/lib/libbsp/i386/pc386/tools/configure.in
index 4ac349b8d2..6a8920bcd1 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in
@@ -10,10 +10,11 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
-AC_CHECK_FUNCS(strtol strtoul)
+AC_CHECK_FUNCS(strtoul)
RTEMS_PROJECT_ROOT
RTEMS_TOOLPATHS
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in
index cc4e21ddc6..a0b6575182 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in
@@ -351,12 +351,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -378,21 +375,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -400,26 +388,14 @@ 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
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in
index 728f999841..0b53b23309 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in
@@ -196,26 +196,14 @@ 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
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in
index b218096166..1032ce3292 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in
@@ -91,7 +91,7 @@ EXTRA_DIST = Makefile.ts_386ex ts1325-button.adb ts1325-parallel.adb i386_port
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = README Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -196,26 +196,14 @@ 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
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in
index 07ca68bb5d..b8e208dc61 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme162/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@
@@ -95,6 +96,7 @@ sload_SOURCES = sload.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = sload$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -164,8 +166,8 @@ distclean-compile:
maintainer-clean-compile:
-sload: $(sload_OBJECTS) $(sload_DEPENDENCIES)
- @rm -f sload
+sload$(EXEEXT): $(sload_OBJECTS) $(sload_DEPENDENCIES)
+ @rm -f sload$(EXEEXT)
$(LINK) $(sload_LDFLAGS) $(sload_OBJECTS) $(sload_LDADD) $(LIBS)
tags: TAGS
@@ -366,26 +368,14 @@ 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
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure b/c/src/lib/libbsp/m68k/mvme162/tools/configure
index 59598a25bf..f2e3bf5172 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/configure
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1162,7 +1257,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1166: checking how to run the C preprocessor" >&5
+echo "configure:1261: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1177,13 +1272,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1181 "configure"
+#line 1276 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1194,13 +1289,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1198 "configure"
+#line 1293 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1211,13 +1306,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1215 "configure"
+#line 1310 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1242,12 +1337,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1246: checking for ANSI C header files" >&5
+echo "configure:1341: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1251 "configure"
+#line 1346 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1255,7 +1350,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1272,7 +1367,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1276 "configure"
+#line 1371 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1290,7 +1385,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1294 "configure"
+#line 1389 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1311,7 +1406,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
+#line 1410 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1322,7 +1417,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1349,17 +1444,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1353: checking for $ac_hdr" >&5
+echo "configure:1448: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1358 "configure"
+#line 1453 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1389,17 +1484,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1393: checking for $ac_hdr" >&5
+echo "configure:1488: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1398 "configure"
+#line 1493 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1428,12 +1523,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1432: checking for $ac_func" >&5
+echo "configure:1527: 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 1437 "configure"
+#line 1532 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1456,7 +1551,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1555: \"$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
@@ -1481,7 +1576,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1485: checking for working mmap" >&5
+echo "configure:1580: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1489,7 +1584,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
+#line 1588 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -1629,7 +1724,7 @@ main()
}
EOF
-if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -1868,6 +1963,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
index e84528b68a..7b9c3d5eb4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
@@ -10,6 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-lib-libbsp-m68k-mvme162-tools,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
index e2b83b43c9..55df818447 100644
--- a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
@@ -248,26 +248,14 @@ 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
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
index c256d2bc74..2b77b1074c 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
@@ -250,26 +250,14 @@ 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
diff --git a/c/src/lib/libbsp/unix/posix/tools/Makefile.in b/c/src/lib/libbsp/unix/posix/tools/Makefile.in
index 32b2fc7d1c..8a8cf55d22 100644
--- a/c/src/lib/libbsp/unix/posix/tools/Makefile.in
+++ b/c/src/lib/libbsp/unix/posix/tools/Makefile.in
@@ -261,26 +261,14 @@ 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
diff --git a/c/src/make/Makefile.in b/c/src/make/Makefile.in
index 4b777d98ad..5a7281b61c 100644
--- a/c/src/make/Makefile.in
+++ b/c/src/make/Makefile.in
@@ -460,12 +460,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
@MAINTAINER_MODE_TRUE@ cp $< $@
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -487,21 +484,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -509,26 +497,14 @@ 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
diff --git a/c/src/make/README b/c/src/make/README
index 6cdc4b2c6e..fbc4ba5cca 100644
--- a/c/src/make/README
+++ b/c/src/make/README
@@ -116,17 +116,14 @@
CFLAGS and/or LDFLAGS are modified as per the compiler config file for
debug and profile support.
- Targets debug_install and profile_install are equivalent to 'make
- install' except that debug (or profile) variants are built and
- installed.
-
- The targets debug, profile, debug_install, profile_install, etc., can be
+ The targets debug, profile, etc., can be
invoked recursively at the directory make level. So from the top of a
tree, one could install a debug version of everything under that point
by:
$ cd src/lib
- $ gmake debug_install
+ $ gmake debug
+ $ gmake install
When building a command that is linked with a generated library, the
appropriate version of the library will be linked in.
diff --git a/c/src/make/Templates/Makefile.in b/c/src/make/Templates/Makefile.in
index b620949339..ec4947ac00 100644
--- a/c/src/make/Templates/Makefile.in
+++ b/c/src/make/Templates/Makefile.in
@@ -257,26 +257,14 @@ 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
diff --git a/c/src/make/compilers/Makefile.in b/c/src/make/compilers/Makefile.in
index e802f333c9..013dcb26fe 100644
--- a/c/src/make/compilers/Makefile.in
+++ b/c/src/make/compilers/Makefile.in
@@ -264,26 +264,14 @@ 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
diff --git a/c/src/make/custom/Makefile.in b/c/src/make/custom/Makefile.in
index ce9154d19c..b005b3bd51 100644
--- a/c/src/make/custom/Makefile.in
+++ b/c/src/make/custom/Makefile.in
@@ -262,26 +262,14 @@ 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
diff --git a/c/src/make/directory.cfg b/c/src/make/directory.cfg
index 056e9fa55e..c3efc38bf0 100644
--- a/c/src/make/directory.cfg
+++ b/c/src/make/directory.cfg
@@ -21,5 +21,40 @@ $(RECURSE_TARGETS):
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
+
+# mostlyclean-recursive maintainer-clean-recursive:
+clean-recursive \
+distclean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ rev=''; list='$(SUB_DIRS)'; 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"
+
+clean-am: clean-generic
+distclean-am: distclean-generic clean-am
+
preinstall: preinstall-recursive
.PHONY: preinstall preinstall-am preinstall-recursive
+
+distclean: distclean-recursive
+ -$(RM) config.status
+
+.PHONY: distclean distclean-am distclean-recursive
+
+clean: clean-recursive
+.PHONY: clean clean-am clean-recursive
+
diff --git a/c/src/make/main.cfg.in b/c/src/make/main.cfg.in
index e0af9ab95a..7a1082fb13 100644
--- a/c/src/make/main.cfg.in
+++ b/c/src/make/main.cfg.in
@@ -57,17 +57,26 @@ VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%}
# List of "recursion-able" targets for directory Makefiles
#
-RECURSE_TARGETS=all clean protos get clobber depend install \
+RECURSE_TARGETS=all depend install \
preinstall-recursive \
-$(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
+$(TARGET_VARIANTS)
${ARCH}:
test -d ${ARCH} || mkdir ${ARCH}
-
# general purpose forcing dependency; try to use .PHONY instead
FORCEIT:
FORCE:
-.PHONY: $(RECURSE_TARGETS)
+distclean-generic:
+ -$(RM) Makefile .#* $(CONFIG_CLEAN_FILES)
+ -$(RM) -r $(CLOBBER_ADDITIONS)
+
+clean-generic:
+ -$(RM) a.out core mon.out gmon.out
+ -$(RM) -r $(CLEAN_ADDITIONS)
+
+.PHONY: $(RECURSE_TARGETS)
+.PHONY: clean-generic
+.PHONY: distclean-generic
diff --git a/c/src/tests/Makefile.in b/c/src/tests/Makefile.in
index 873e893645..013693cf51 100644
--- a/c/src/tests/Makefile.in
+++ b/c/src/tests/Makefile.in
@@ -46,6 +46,8 @@ SUB_DIRS = $(wildcard tools support samples libtests sptests $(MP_TESTS) \
preinstall: $(INSTALLDIRS)
+CLOBBER_ADDITIONS += config.log config.cache
+
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/tests/tools/generic/Makefile.in b/c/src/tests/tools/generic/Makefile.in
index 2418c278d7..cb18baf662 100644
--- a/c/src/tests/tools/generic/Makefile.in
+++ b/c/src/tests/tools/generic/Makefile.in
@@ -248,26 +248,14 @@ 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
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1d672f1eda..0a00f02da6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -195,26 +195,14 @@ 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
diff --git a/make/Makefile.in b/make/Makefile.in
index 652737519e..39ba5d995a 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -328,12 +328,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -355,21 +352,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -377,26 +365,14 @@ 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
diff --git a/make/README b/make/README
index 6cdc4b2c6e..fbc4ba5cca 100644
--- a/make/README
+++ b/make/README
@@ -116,17 +116,14 @@
CFLAGS and/or LDFLAGS are modified as per the compiler config file for
debug and profile support.
- Targets debug_install and profile_install are equivalent to 'make
- install' except that debug (or profile) variants are built and
- installed.
-
- The targets debug, profile, debug_install, profile_install, etc., can be
+ The targets debug, profile, etc., can be
invoked recursively at the directory make level. So from the top of a
tree, one could install a debug version of everything under that point
by:
$ cd src/lib
- $ gmake debug_install
+ $ gmake debug
+ $ gmake install
When building a command that is linked with a generated library, the
appropriate version of the library will be linked in.
diff --git a/make/Templates/Makefile.in b/make/Templates/Makefile.in
index 43c56ada2f..2bafd8f7f2 100644
--- a/make/Templates/Makefile.in
+++ b/make/Templates/Makefile.in
@@ -196,26 +196,14 @@ 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
diff --git a/make/compilers/Makefile.in b/make/compilers/Makefile.in
index 364bd47e32..0ca5e4ad5d 100644
--- a/make/compilers/Makefile.in
+++ b/make/compilers/Makefile.in
@@ -196,26 +196,14 @@ 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
diff --git a/make/custom/Makefile.in b/make/custom/Makefile.in
index fe7c0a5f5a..84f9b50cfb 100644
--- a/make/custom/Makefile.in
+++ b/make/custom/Makefile.in
@@ -224,26 +224,14 @@ 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
diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg
index 7a609e2f7c..3502933fca 100644
--- a/make/custom/ts_386ex.cfg
+++ b/make/custom/ts_386ex.cfg
@@ -23,10 +23,6 @@ CPU_CFLAGS =-msoft-float -mno-fp-ret-in-387
# -fomit-frame-pointer breaks debugging and C++ exceptions
CFLAGS_OPTIMIZE_V=-O4
-# This target does support the TCP/IP stack so honour requests
-# to enable it.
-HAS_NETWORKING=yes
-
# This BSP does not support librdbg
HAS_RDBG=no
diff --git a/make/directory.cfg b/make/directory.cfg
index 056e9fa55e..c3efc38bf0 100644
--- a/make/directory.cfg
+++ b/make/directory.cfg
@@ -21,5 +21,40 @@ $(RECURSE_TARGETS):
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
+
+# mostlyclean-recursive maintainer-clean-recursive:
+clean-recursive \
+distclean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ rev=''; list='$(SUB_DIRS)'; 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"
+
+clean-am: clean-generic
+distclean-am: distclean-generic clean-am
+
preinstall: preinstall-recursive
.PHONY: preinstall preinstall-am preinstall-recursive
+
+distclean: distclean-recursive
+ -$(RM) config.status
+
+.PHONY: distclean distclean-am distclean-recursive
+
+clean: clean-recursive
+.PHONY: clean clean-am clean-recursive
+
diff --git a/make/leaf.cfg b/make/leaf.cfg
index 0dba22970e..0106dc19ce 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -55,13 +55,13 @@ endif
#
# Builtin targets for compilation variants
#
-debug debug_install:
+debug:
$(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-debug" \
"CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \
"CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \
"LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA)
-profile profile_install:
+profile:
$(MAKE) -f $(MAKEFILE) \
MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-profile" \
"CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \
@@ -80,8 +80,7 @@ VARIANT-$(TARGET_ARCH)-profile-v = profile
VARIANT_VA = $(VARIANT-$(ARCH)-v)
#
-# TARGET_VA will convert $@ (expected to be 'debug' or
-# 'debug_install' or 'profile' etc.)
+# TARGET_VA will convert $@ (expected to be 'debug' or 'profile' etc.)
# into "" or "install" as appropriate.
# Used for variant recursion.
#
@@ -89,9 +88,6 @@ VARIANT_VA = $(VARIANT-$(ARCH)-v)
TARGET_debug_V = all
TARGET_profile_V = all
-TARGET_debug_install_V = install
-TARGET_profile_install_V = install
-
TARGET_VA = $(TARGET_$@_V)
#
@@ -107,24 +103,26 @@ LIBSUFFIX_$(TARGET_ARCH)-profile_V=_p
LIB_VARIANT=$(LIBSUFFIX_$(ARCH)_V)
LIBSUFFIX_VA = $(LIB_VARIANT).a
-get: $(SRCS) $(GET_ADDITIONS)
-
#
-# Builtin clean and clobber rules
+# Builtin clean and distclean rules
# Individual makefiles can add stuff via CLEAN_ADDITIONS and CLOBBER_ADDITIONS
# If desperate to save something, they can override CLEAN_OS, CLEAN_CC, etc.
#
-clean:
- $(RM) -r a.out core mon.out gmon.out $(CLEAN_OS) $(CLEAN_CC)
- $(RM) -r $(CLEAN_PROTO) $(CLEAN_DEPEND) a.out
- $(RM) -r $(VARIANTS) $(CLEAN_ADDITIONS) $(IMPORT_SOURCE)
+clean-am: clean-generic
+ -$(RM) -r $(CLEAN_OS) $(CLEAN_CC) $(CLEAN_DEPEND)
+ -$(RM) -r $(VARIANTS)
+# -$(RM) -r $(IMPORT_SOURCE)
-clobber: clean
- -$(RCS_CLEAN)
- $(RM) .#*
- $(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
- $(RM) -r $(CLOBBER_ADDITIONS) a.out
+distclean-am: distclean-generic clean-am
+ -$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
preinstall-am:
preinstall: preinstall-am
+
+distclean: distclean-am
+ -$(RM) config.status
+clean: clean-am
+
+.PHONY: distclean distclean-am
+.PHONY: clean clean-am
diff --git a/make/main.cfg b/make/main.cfg
index 031a4047f2..f64b75ad64 100644
--- a/make/main.cfg
+++ b/make/main.cfg
@@ -57,17 +57,26 @@ VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%}
# List of "recursion-able" targets for directory Makefiles
#
-RECURSE_TARGETS=all clean protos get clobber depend install \
+RECURSE_TARGETS=all depend install \
preinstall-recursive \
-$(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
+$(TARGET_VARIANTS)
${ARCH}:
test -d ${ARCH} || mkdir ${ARCH}
-
# general purpose forcing dependency; try to use .PHONY instead
FORCEIT:
FORCE:
-.PHONY: $(RECURSE_TARGETS)
+distclean-generic:
+ -$(RM) Makefile .#* $(CONFIG_CLEAN_FILES)
+ -$(RM) -r $(CLOBBER_ADDITIONS)
+
+clean-generic:
+ -$(RM) a.out core mon.out gmon.out
+ -$(RM) -r $(CLEAN_ADDITIONS)
+
+.PHONY: $(RECURSE_TARGETS)
+.PHONY: clean-generic
+.PHONY: distclean-generic
diff --git a/tools/Makefile.in b/tools/Makefile.in
index a81cdf2a2d..f0eb4c7aa0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -293,12 +293,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -320,21 +317,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -342,26 +330,14 @@ 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
diff --git a/tools/build/Makefile.am b/tools/build/Makefile.am
index ed0be76b44..fd56b93545 100644
--- a/tools/build/Makefile.am
+++ b/tools/build/Makefile.am
@@ -5,12 +5,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-bin_PROGRAMS=cklength eolstrip packhex unhex
+bin_PROGRAMS = cklength eolstrip packhex unhex
+
+noinst_PROGRAMS = binpatch
cklength_SOURCES = cklength.c
eolstrip_SOURCES = eolstrip.c
packhex_SOURCES = packhex.c
unhex_SOURCES = unhex.c
+binpatch_SOURCES = binpatch.c
bin_SCRIPTS=\
install-if-change \
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index ae7cb5e9c5..cf43066e74 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -76,12 +76,15 @@ VERSION = @VERSION@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-bin_PROGRAMS = cklength eolstrip packhex unhex
+bin_PROGRAMS = cklength eolstrip packhex unhex
+
+noinst_PROGRAMS = binpatch
cklength_SOURCES = cklength.c
eolstrip_SOURCES = eolstrip.c
packhex_SOURCES = packhex.c
unhex_SOURCES = unhex.c
+binpatch_SOURCES = binpatch.c
bin_SCRIPTS = install-if-change lock-directory unlock-directory rcs-clean
@@ -94,7 +97,8 @@ 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)
+noinst_PROGRAMS = binpatch$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I.
@@ -117,6 +121,10 @@ unhex_OBJECTS = unhex.o
unhex_LDADD = $(LDADD)
unhex_DEPENDENCIES =
unhex_LDFLAGS =
+binpatch_OBJECTS = binpatch.o
+binpatch_LDADD = $(LDADD)
+binpatch_DEPENDENCIES =
+binpatch_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
CFLAGS = @CFLAGS@
@@ -132,10 +140,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
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)
+DEP_FILES = .deps/binpatch.P .deps/cklength.P .deps/eolstrip.P \
+.deps/packhex.P .deps/unhex.P
+SOURCES = $(cklength_SOURCES) $(eolstrip_SOURCES) $(packhex_SOURCES) $(unhex_SOURCES) $(binpatch_SOURCES)
+OBJECTS = $(cklength_OBJECTS) $(eolstrip_OBJECTS) $(packhex_OBJECTS) $(unhex_OBJECTS) $(binpatch_OBJECTS)
all: all-redirect
.SUFFIXES:
@@ -216,6 +224,15 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
.s.o:
$(COMPILE) -c $<
@@ -248,6 +265,10 @@ unhex$(EXEEXT): $(unhex_OBJECTS) $(unhex_DEPENDENCIES)
@rm -f unhex$(EXEEXT)
$(LINK) $(unhex_LDFLAGS) $(unhex_OBJECTS) $(unhex_LDADD) $(LIBS)
+binpatch$(EXEEXT): $(binpatch_OBJECTS) $(binpatch_DEPENDENCIES)
+ @rm -f binpatch$(EXEEXT)
+ $(LINK) $(binpatch_LDFLAGS) $(binpatch_OBJECTS) $(binpatch_LDADD) $(LIBS)
+
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -421,17 +442,19 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
- mostlyclean-compile mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
+ mostlyclean-noinstPROGRAMS 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-am: clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS \
+ clean-compile clean-tags clean-depend clean-generic \
+ mostlyclean-am
clean: clean-am
-distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
+distclean-am: distclean-hdr distclean-binPROGRAMS \
+ distclean-noinstPROGRAMS distclean-compile \
distclean-tags distclean-depend distclean-generic \
clean-am
@@ -439,6 +462,7 @@ distclean: distclean-am
-rm -f config.status
maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+ maintainer-clean-noinstPROGRAMS \
maintainer-clean-compile maintainer-clean-tags \
maintainer-clean-depend maintainer-clean-generic \
distclean-am
@@ -451,6 +475,8 @@ maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
@@ -467,26 +493,14 @@ 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
diff --git a/tools/build/binpatch.c b/tools/build/binpatch.c
index ab0900702a..9f7e87c835 100644
--- a/tools/build/binpatch.c
+++ b/tools/build/binpatch.c
@@ -154,15 +154,3 @@ main(int argc, char **argv)
return 0;
}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/build/config.h.in b/tools/build/config.h.in
index 1c62638b8b..27a3499112 100644
--- a/tools/build/config.h.in
+++ b/tools/build/config.h.in
@@ -2,3 +2,6 @@
/* Define if you have the strerror function. */
#undef HAVE_STRERROR
+
+/* Define if you have the strtol function. */
+#undef HAVE_STRTOL
diff --git a/tools/build/configure b/tools/build/configure
index 5641970730..6ebc34b503 100644
--- a/tools/build/configure
+++ b/tools/build/configure
@@ -1166,7 +1166,7 @@ else
fi
fi
-for ac_func in strerror
+for ac_func in strerror strtol
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1173: checking for $ac_func" >&5
diff --git a/tools/build/configure.in b/tools/build/configure.in
index fe1fefaa42..486938ce2b 100644
--- a/tools/build/configure.in
+++ b/tools/build/configure.in
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE
AC_EXEEXT
AC_PROG_CC
-AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNCS(strerror strtol)
RTEMS_PATH_KSH
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index 3f5e69e0d2..6261aeb5e4 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/cpu/Makefile.in
@@ -343,12 +343,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
depend-recursive \
-clobber-recursive \
preinstall-recursive \
debug-recursive \
-debug_install-recursive \
-profile-recursive \
-profile_install-recursive:
+profile-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -370,21 +367,12 @@ profile_install-recursive:
debug: debug-recursive
.PHONY: debug-recursive
-debug_install: debug_install-recursive
-.PHONY: debug_install-recursive
-
profile: profile-recursive
.PHONY: profile-recursive
-profile_install: profile_install-recursive
-.PHONY: profile-recursive
-
preinstall: preinstall-recursive
.PHONY: preinstall-recursive
-clobber: clobber-recursive
-.PHONY: clobber-recursive
-
depend: depend-recursive
.PHONY: depend-recursive
@@ -392,26 +380,14 @@ 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
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index d98fa92e7c..a306b4ccd1 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -246,26 +246,14 @@ 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
diff --git a/tools/cpu/hppa1.1/configure b/tools/cpu/hppa1.1/configure
index a74d0d8e35..807c5d13ed 100644
--- a/tools/cpu/hppa1.1/configure
+++ b/tools/cpu/hppa1.1/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1377,6 +1472,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
s%@RTEMS_ROOT@%$RTEMS_ROOT%g
diff --git a/tools/cpu/hppa1.1/configure.in b/tools/cpu/hppa1.1/configure.in
index 3d6b624500..ac742498f9 100644
--- a/tools/cpu/hppa1.1/configure.in
+++ b/tools/cpu/hppa1.1/configure.in
@@ -10,6 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-cpu-tools-hppa,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
index a2379c180d..602b37c786 100644
--- a/tools/cpu/sh/Makefile.in
+++ b/tools/cpu/sh/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@
@@ -96,6 +97,7 @@ shgen_SOURCES = sci.h sci.c shgen.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = shgen$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -166,8 +168,8 @@ distclean-compile:
maintainer-clean-compile:
-shgen: $(shgen_OBJECTS) $(shgen_DEPENDENCIES)
- @rm -f shgen
+shgen$(EXEEXT): $(shgen_OBJECTS) $(shgen_DEPENDENCIES)
+ @rm -f shgen$(EXEEXT)
$(LINK) $(shgen_LDFLAGS) $(shgen_OBJECTS) $(shgen_LDADD) $(LIBS)
tags: TAGS
@@ -362,26 +364,14 @@ 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
diff --git a/tools/cpu/sh/configure b/tools/cpu/sh/configure
index 4c0dbf24a2..9359a97c12 100644
--- a/tools/cpu/sh/configure
+++ b/tools/cpu/sh/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1161,7 +1256,7 @@ else
fi
echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
-echo "configure:1165: checking for fabs in -lm" >&5
+echo "configure:1260: checking for fabs in -lm" >&5
ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1169,7 +1264,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1173 "configure"
+#line 1268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1180,7 +1275,7 @@ int main() {
fabs()
; return 0; }
EOF
-if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1424,6 +1519,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
s%@RTEMS_ROOT@%$RTEMS_ROOT%g
diff --git a/tools/cpu/sh/configure.in b/tools/cpu/sh/configure.in
index 6275c5b613..80a4b07cd7 100644
--- a/tools/cpu/sh/configure.in
+++ b/tools/cpu/sh/configure.in
@@ -10,6 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-cpu-tools-sh,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
AC_CHECK_LIB(m,fabs)
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index f32afab2c4..df0bce10e2 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/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@
@@ -95,6 +96,7 @@ gensize_SOURCES = gensize.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = gensize$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
@@ -164,8 +166,8 @@ distclean-compile:
maintainer-clean-compile:
-gensize: $(gensize_OBJECTS) $(gensize_DEPENDENCIES)
- @rm -f gensize
+gensize$(EXEEXT): $(gensize_OBJECTS) $(gensize_DEPENDENCIES)
+ @rm -f gensize$(EXEEXT)
$(LINK) $(gensize_LDFLAGS) $(gensize_OBJECTS) $(gensize_LDADD) $(LIBS)
tags: TAGS
@@ -360,26 +362,14 @@ 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
diff --git a/tools/cpu/unix/configure b/tools/cpu/unix/configure
index bae42e6623..3d7515c189 100644
--- a/tools/cpu/unix/configure
+++ b/tools/cpu/unix/configure
@@ -937,11 +937,106 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:942: 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 947 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+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:975: 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 980 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_mingw32=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1006: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+ ac_cv_exeext=.exe
+else
+ rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj) ;;
+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ else
+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+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:945: checking for $ac_word" >&5
+echo "configure:1040: 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
@@ -971,7 +1066,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:975: checking for $ac_word" >&5
+echo "configure:1070: 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
@@ -1022,7 +1117,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:1026: checking for $ac_word" >&5
+echo "configure:1121: 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
@@ -1054,7 +1149,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1153: 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.
@@ -1065,12 +1160,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1069 "configure"
+#line 1164 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1169: \"$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
@@ -1096,12 +1191,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:1100: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1195: 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:1105: checking whether we are using GNU C" >&5
+echo "configure:1200: 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
@@ -1110,7 +1205,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1114: \"$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:1209: \"$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
@@ -1129,7 +1224,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:1133: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1228: 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
@@ -1377,6 +1472,7 @@ s%@SET_MAKE@%$SET_MAKE%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
s%@CC@%$CC%g
s%@PROJECT_ROOT@%$PROJECT_ROOT%g
s%@RTEMS_ROOT@%$RTEMS_ROOT%g
diff --git a/tools/cpu/unix/configure.in b/tools/cpu/unix/configure.in
index bf53d69ba5..fcf8d14ff0 100644
--- a/tools/cpu/unix/configure.in
+++ b/tools/cpu/unix/configure.in
@@ -10,6 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE(rtems-cpu-tools-unix,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
+AC_EXEEXT
AC_PROG_CC
diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in
index 0a774c2163..4c2937ad9d 100644
--- a/tools/update/Makefile.in
+++ b/tools/update/Makefile.in
@@ -263,26 +263,14 @@ 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