summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-09-07 13:45:03 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-09-07 13:45:03 +0000
commite1d8abbe2800defb344dcce54c401733edd1d37a (patch)
tree56e416222d2ed47222be37f868a06c93656edc72 /tools
parentc935c5f9db201a63c8e5914ec7cdadf36186ff8f (diff)
downloadrtems-e1d8abbe2800defb344dcce54c401733edd1d37a.tar.bz2
Applied patch rtems-rc-19990820-6.diff.gz from
Ralf Corsepius <corsepiu@faw.uni-ulm.de> which converted many Makefile.in's to Makefile.am's. This added a lot of files.
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in2
-rw-r--r--tools/build/Makefile.in2
-rw-r--r--tools/build/configure2
-rw-r--r--tools/build/configure.in2
-rw-r--r--tools/cpu/Makefile.am2
-rw-r--r--tools/cpu/Makefile.in6
-rw-r--r--tools/cpu/configure2
-rw-r--r--tools/cpu/configure.in2
-rw-r--r--tools/cpu/generic/Makefile.in2
-rw-r--r--tools/cpu/sh/Makefile.in2
-rw-r--r--tools/cpu/unix/Makefile.in2
-rw-r--r--tools/update/Makefile.in2
-rw-r--r--tools/update/configure2
-rw-r--r--tools/update/configure.in2
14 files changed, 18 insertions, 14 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index f0eb4c7aa0..0fb03fbef4 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -334,7 +334,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 157600cca7..cf033e0262 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -494,7 +494,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/build/configure b/tools/build/configure
index 7f00f124b2..852697883a 100644
--- a/tools/build/configure
+++ b/tools/build/configure
@@ -748,7 +748,7 @@ else
fi
-PACKAGE=rtems-build-tools
+PACKAGE=rtems-tools-build
VERSION=$RTEMS_VERSION
diff --git a/tools/build/configure.in b/tools/build/configure.in
index 0876640421..ea8c342706 100644
--- a/tools/build/configure.in
+++ b/tools/build/configure.in
@@ -9,7 +9,7 @@ RTEMS_TOP(../..)
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(rtems-build-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-tools-build,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
AC_EXEEXT
diff --git a/tools/cpu/Makefile.am b/tools/cpu/Makefile.am
index 98bd40c3e4..c798891b3e 100644
--- a/tools/cpu/Makefile.am
+++ b/tools/cpu/Makefile.am
@@ -7,5 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
SUBDIRS = @subdirs@
+DIST_SUBDIRS = generic hppa1.1 sh unix
+
include $(top_srcdir)/../../automake/subdirs.am
include $(top_srcdir)/../../automake/local.am
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index 6261aeb5e4..231a1d3318 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/cpu/Makefile.in
@@ -92,6 +92,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
SUBDIRS = @subdirs@
+
+DIST_SUBDIRS = generic hppa1.1 sh unix
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
CONFIG_CLEAN_FILES =
@@ -261,7 +263,7 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
- for subdir in $(SUBDIRS); do \
+ for subdir in $(DIST_SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
@@ -384,7 +386,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/cpu/configure b/tools/cpu/configure
index 2f73f5bd15..e11a804b63 100644
--- a/tools/cpu/configure
+++ b/tools/cpu/configure
@@ -837,7 +837,7 @@ else
fi
-PACKAGE=rtems-cpu-tools
+PACKAGE=rtems-tools-cpu
VERSION=$RTEMS_VERSION
diff --git a/tools/cpu/configure.in b/tools/cpu/configure.in
index 48807a253d..b469f1ea31 100644
--- a/tools/cpu/configure.in
+++ b/tools/cpu/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(../..)
RTEMS_TOP(../..)
RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-cpu-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-tools-cpu,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_PATH_KSH
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index a306b4ccd1..2e0abe9aa2 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -250,7 +250,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
index 602b37c786..b8e81c602e 100644
--- a/tools/cpu/sh/Makefile.in
+++ b/tools/cpu/sh/Makefile.in
@@ -368,7 +368,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index df0bce10e2..5027456106 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/Makefile.in
@@ -366,7 +366,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in
index 4c2937ad9d..6737873ecb 100644
--- a/tools/update/Makefile.in
+++ b/tools/update/Makefile.in
@@ -267,7 +267,7 @@ profile-am:
profile: profile-am
.PHONY: profile profile-am
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
diff --git a/tools/update/configure b/tools/update/configure
index b2cb7845f5..b26dd45eb6 100644
--- a/tools/update/configure
+++ b/tools/update/configure
@@ -748,7 +748,7 @@ else
fi
-PACKAGE=rtems-update-tools
+PACKAGE=rtems-tools-update
VERSION=$RTEMS_VERSION
diff --git a/tools/update/configure.in b/tools/update/configure.in
index 23a86f8b7e..737f99e296 100644
--- a/tools/update/configure.in
+++ b/tools/update/configure.in
@@ -9,7 +9,7 @@ RTEMS_TOP(../..)
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(rtems-update-tools,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-tools-update,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_PATH_KSH