Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to address problems

on BSPs that install there own tools.
This commit is contained in:
Joel Sherrill
1999-04-01 16:58:06 +00:00
parent 517660f192
commit f72dd2a9fa
10 changed files with 33 additions and 33 deletions

View File

@@ -8,7 +8,7 @@ ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
noinst_SCRIPTS=psim runtest noinst_SCRIPTS=psim runtest
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest $(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest
$(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/${RTEMS_BSP}/tests/psim $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/${RTEMS_BSP}/tests/psim

View File

@@ -176,7 +176,7 @@ check-am: all-am
check: check-am check: check-am
installcheck-am: installcheck-am:
installcheck: installcheck-am installcheck: installcheck-am
install-exec-am: install-exec-local install-exec-am:
install-exec: install-exec-am install-exec: install-exec-am
install-data-am: install-data-am:
@@ -187,7 +187,7 @@ install-am: all-am
install: install-am install: install-am
uninstall-am: uninstall-am:
uninstall: uninstall-am uninstall: uninstall-am
all-am: Makefile $(SCRIPTS) all-am: Makefile $(SCRIPTS) all-local
all-redirect: all-am all-redirect: all-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -224,15 +224,15 @@ maintainer-clean: maintainer-clean-am
-rm -f config.status -rm -f config.status
.PHONY: tags distdir info-am info dvi-am dvi check check-am \ .PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-local install-exec-am \ installcheck-am installcheck install-exec-am install-exec \
install-exec install-data-am install-data install-am install \ install-data-am install-data install-am install uninstall-am uninstall \
uninstall-am uninstall all-redirect all-am all installdirs \ all-local all-redirect all-am all installdirs mostlyclean-generic \
mostlyclean-generic distclean-generic clean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean mostlyclean distclean maintainer-clean
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest $(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest
$(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/${RTEMS_BSP}/tests/psim $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/${RTEMS_BSP}/tests/psim

View File

@@ -8,7 +8,7 @@ ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
noinst_SCRIPTS=runtest noinst_SCRIPTS=runtest
#HACK: install to build-tree #HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest

View File

@@ -180,7 +180,7 @@ check-am: all-am
check: check-am check: check-am
installcheck-am: installcheck-am:
installcheck: installcheck-am installcheck: installcheck-am
install-exec-am: install-exec-local install-exec-am:
install-exec: install-exec-am install-exec: install-exec-am
install-data-am: install-data-am:
@@ -191,7 +191,7 @@ install-am: all-am
install: install-am install: install-am
uninstall-am: uninstall-am:
uninstall: uninstall-am uninstall: uninstall-am
all-am: Makefile $(SCRIPTS) all-am: Makefile $(SCRIPTS) all-local
all-redirect: all-am all-redirect: all-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -228,15 +228,15 @@ maintainer-clean: maintainer-clean-am
-rm -f config.status -rm -f config.status
.PHONY: tags distdir info-am info dvi-am dvi check check-am \ .PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-local install-exec-am \ installcheck-am installcheck install-exec-am install-exec \
install-exec install-data-am install-data install-am install \ install-data-am install-data install-am install uninstall-am uninstall \
uninstall-am uninstall all-redirect all-am all installdirs \ all-local all-redirect all-am all installdirs mostlyclean-generic \
mostlyclean-generic distclean-generic clean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean mostlyclean distclean maintainer-clean
#HACK: install to build-tree #HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest

View File

@@ -12,7 +12,7 @@ endif
noinst_SCRIPTS=runtest looptest $(perl_scripts) noinst_SCRIPTS=runtest looptest $(perl_scripts)
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
for i in $(SCRIPTS); do \ for i in $(SCRIPTS); do \
$(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/tests ; \ $(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/tests ; \

View File

@@ -8,7 +8,7 @@ ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
noinst_SCRIPTS=difftest sorttimes noinst_SCRIPTS=difftest sorttimes
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests

View File

@@ -182,7 +182,7 @@ check-am: all-am
check: check-am check: check-am
installcheck-am: installcheck-am:
installcheck: installcheck-am installcheck: installcheck-am
install-exec-am: install-exec-local install-exec-am:
install-exec: install-exec-am install-exec: install-exec-am
install-data-am: install-data-am:
@@ -193,7 +193,7 @@ install-am: all-am
install: install-am install: install-am
uninstall-am: uninstall-am:
uninstall: uninstall-am uninstall: uninstall-am
all-am: Makefile $(SCRIPTS) all-am: Makefile $(SCRIPTS) all-local
all-redirect: all-am all-redirect: all-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -230,15 +230,15 @@ maintainer-clean: maintainer-clean-am
-rm -f config.status -rm -f config.status
.PHONY: tags distdir info-am info dvi-am dvi check check-am \ .PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-local install-exec-am \ installcheck-am installcheck install-exec-am install-exec \
install-exec install-data-am install-data install-am install \ install-data-am install-data install-am install uninstall-am uninstall \
uninstall-am uninstall all-redirect all-am all installdirs \ all-local all-redirect all-am all installdirs mostlyclean-generic \
mostlyclean-generic distclean-generic clean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean mostlyclean distclean maintainer-clean
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests

4
configure vendored
View File

@@ -3979,8 +3979,8 @@ subdirs="c/src/tests/tools/generic c/build-tools $scoretools_cfgdirs"
subdirs="c/src/tests/tools/generic c/build-tools $scoretools_cfgdirs $bsptools_cfgdirs" subdirs="c/src/tests/tools/generic c/build-tools $scoretools_cfgdirs $bsptools_cfgdirs"
# FIXME: libwapi needs a separate configure.in in future ;- # FIXME: libhwapi needs a separate configure.in in future ;-
# AC_CONFIG_SUBDIRS(c/src/lib/libwapi) # AC_CONFIG_SUBDIRS(c/src/lib/libhwapi)
# try not to explicitly list a Makefile here # try not to explicitly list a Makefile here
trap '' 1 2 15 trap '' 1 2 15

View File

@@ -392,8 +392,8 @@ AC_CONFIG_SUBDIRS(c/build-tools)
AC_CONFIG_SUBDIRS($scoretools_cfgdirs) AC_CONFIG_SUBDIRS($scoretools_cfgdirs)
AC_CONFIG_SUBDIRS($bsptools_cfgdirs) AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
# FIXME: libwapi needs a separate configure.in in future ;- # FIXME: libhwapi needs a separate configure.in in future ;-
# AC_CONFIG_SUBDIRS(c/src/lib/libwapi) # AC_CONFIG_SUBDIRS(c/src/lib/libhwapi)
# try not to explicitly list a Makefile here # try not to explicitly list a Makefile here
AC_OUTPUT( AC_OUTPUT(

View File

@@ -8,7 +8,7 @@ ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
noinst_SCRIPTS=difftest sorttimes noinst_SCRIPTS=difftest sorttimes
# HACK: install to build-tree # HACK: install to build-tree
install-exec-local: $(SCRIPTS) all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) difftest $(PROJECT_ROOT)/${RTEMS_BSP}/tests
$(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests $(INSTALL_SCRIPT) sorttimes $(PROJECT_ROOT)/${RTEMS_BSP}/tests