From 74c77c5cdfc94f6d84d12c3685aadbd6bde44dd8 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 30 Nov 2003 07:52:50 +0000
Subject: 2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Preinstall adainclude_HEADERS.
	Add $(dirstamp) to preinstallation rules.
---
 cpukit/ada/ChangeLog   |  5 +++++
 cpukit/ada/Makefile.am | 35 +++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ada/ChangeLog b/cpukit/ada/ChangeLog
index 35140512e5..1fa54ea2a5 100644
--- a/cpukit/ada/ChangeLog
+++ b/cpukit/ada/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Preinstall adainclude_HEADERS.
+	Add $(dirstamp) to preinstallation rules.
+
 2003-11-25	Joel Sherrill <joel@OARcorp.com>
 
 	PR 528/rtems_misc
diff --git a/cpukit/ada/Makefile.am b/cpukit/ada/Makefile.am
index 635f636352..4b2a807b16 100644
--- a/cpukit/ada/Makefile.am
+++ b/cpukit/ada/Makefile.am
@@ -2,23 +2,38 @@
 # $Id$
 #
 
-$(PROJECT_INCLUDE)/adainclude:
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/adainclude/%: %
-	$(INSTALL_DATA) $< $@
-
 adaincludedir = $(includedir)/adainclude
 
 if RTEMS_ADA
 adainclude_HEADERS = rtems.adb rtems.ads 
 adainclude_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads
-
-TMPINSTALL_FILES = \
-  $(PROJECT_INCLUDE)/adainclude \
-  $(adainclude_HEADERS:%=$(PROJECT_INCLUDE)/adainclude/%) \
-  $(nodist_adalib_HEADERS:%=$(PROJECT_INCLUDE)/adainclude/%)
 endif
 
 all-local: $(TMPINSTALL_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/adainclude
+	@: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+
+if RTEMS_ADA
+$(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.adb
+
+$(PROJECT_INCLUDE)/adainclude/rtems.ads: rtems.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.ads
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.ads
+
+$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb: rtems-multiprocessing.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
+
+$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: rtems-multiprocessing.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
+endif
+
 include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3