summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 05:46:26 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 05:46:26 +0000
commit898db757dae8a2963de73093931a864585699bae (patch)
tree221bd948858dc3dfb3cd6a17dbb74cfdd609f895 /c/src
parent2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-898db757dae8a2963de73093931a864585699bae.tar.bz2
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Misc cleanups and fixes.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/unix/posix/tools/ChangeLog4
-rw-r--r--c/src/lib/libbsp/unix/posix/tools/Makefile.am45
2 files changed, 30 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/unix/posix/tools/ChangeLog b/c/src/lib/libbsp/unix/posix/tools/ChangeLog
index 2dde8e7cb2..bcb4cf5395 100644
--- a/c/src/lib/libbsp/unix/posix/tools/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Misc cleanups and fixes.
+
2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use AC_PATH_PROG(PERL,perl) instead of
diff --git a/c/src/lib/libbsp/unix/posix/tools/Makefile.am b/c/src/lib/libbsp/unix/posix/tools/Makefile.am
index 3688174286..e2b1140b97 100644
--- a/c/src/lib/libbsp/unix/posix/tools/Makefile.am
+++ b/c/src/lib/libbsp/unix/posix/tools/Makefile.am
@@ -4,33 +4,40 @@
ACLOCAL_AMFLAGS = -I ../../../../../aclocal
+transform =
+bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests
+bsptools_bin_SCRIPTS = runtest looptest
+
if PERL
-perl_scripts = shmdump semdump
-PERL_TMPINSTALL_FILES = $(PROJECT_ROOT)/posix/tests/shmdump \
- $(PROJECT_ROOT)/posix/tests/semdump
+bsptools_bin_SCRIPTS += shmdump semdump
endif
-noinst_SCRIPTS = runtest looptest $(perl_scripts)
-
-$(PROJECT_ROOT)/posix/tests:
- $(mkinstalldirs) $@
+## HACK: install to build-tree
+all-local: $(TMPINSTALL_FILES)
-$(PROJECT_ROOT)/posix/tests/runtest: runtest
- $(INSTALL_SCRIPT) $< $@
+TMPINSTALL_FILES =
-$(PROJECT_ROOT)/posix/tests/looptest: looptest
- $(INSTALL_SCRIPT) $< $@
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/tests
+ @: > $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
-$(PROJECT_ROOT)/posix/tests/shmdump: shmdump
- $(INSTALL_SCRIPT) $< $@
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest: runtest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+ $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest
-$(PROJECT_ROOT)/posix/tests/semdump: semdump
- $(INSTALL_SCRIPT) $< $@
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/looptest: looptest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+ $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/looptest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/looptest
-TMPINSTALL_FILES = $(PROJECT_ROOT)/posix/tests \
- $(PROJECT_ROOT)/posix/tests/runtest $(PROJECT_ROOT)/posix/tests/looptest
+if PERL
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/shmdump: shmdump $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+ $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/shmdump
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/shmdump
-## HACK: install to build-tree
-all-local: $(TMPINSTALL_FILES) $(PERL_TMPINSTALL_FILES)
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/semdump: semdump $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+ $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/semdump
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/semdump
+endif
include $(top_srcdir)/../../../../../automake/host.am