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
This commit is contained in:
Joel Sherrill
1999-07-26 21:26:44 +00:00
parent 08b5f55b6f
commit 29e68b7584
66 changed files with 921 additions and 877 deletions
+1 -25
View File
@@ -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
+4 -1
View File
@@ -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 \
+37 -23
View File
@@ -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
-12
View File
@@ -154,15 +154,3 @@ main(int argc, char **argv)
return 0;
}
+3
View File
@@ -2,3 +2,6 @@
/* Define if you have the strerror function. */
#undef HAVE_STRERROR
/* Define if you have the strtol function. */
#undef HAVE_STRTOL
+1 -1
View File
@@ -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
+1 -1
View File
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE
AC_EXEEXT
AC_PROG_CC
AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(strerror strtol)
RTEMS_PATH_KSH
+1 -25
View File
@@ -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
-12
View File
@@ -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
+106 -10
View File
@@ -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
+1
View File
@@ -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
+4 -14
View File
@@ -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
+109 -13
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -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)
+4 -14
View File
@@ -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
+106 -10
View File
@@ -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
+1
View File
@@ -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
-12
View File
@@ -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