summaryrefslogtreecommitdiffstats
path: root/tools/build
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 /tools/build
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 'tools/build')
-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
6 files changed, 46 insertions, 38 deletions
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