summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-14 05:21:02 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-14 05:21:02 +0000
commite81cc508c218f3dbdc1d65101286d9a190ee89f9 (patch)
tree59cfa03e02261cd902ef810fb64b61b8efc76e91 /c
parent2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-e81cc508c218f3dbdc1d65101286d9a190ee89f9.tar.bz2
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Move include_adadir into RTEMS_ADA condional block. Add CLEANFILES. Add PREINSTALL_FILES to CLEANFILES.
Diffstat (limited to 'c')
-rw-r--r--c/src/ada/ChangeLog5
-rw-r--r--c/src/ada/Makefile.am8
2 files changed, 10 insertions, 3 deletions
diff --git a/c/src/ada/ChangeLog b/c/src/ada/ChangeLog
index 2879853596..0288e4c1e0 100644
--- a/c/src/ada/ChangeLog
+++ b/c/src/ada/ChangeLog
@@ -1,5 +1,10 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * Makefile.am: Move include_adadir into RTEMS_ADA condional block.
+ Add CLEANFILES. Add PREINSTALL_FILES to CLEANFILES.
+
+2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/c/src/ada/Makefile.am b/c/src/ada/Makefile.am
index 17f4223a75..3f4977d13d 100644
--- a/c/src/ada/Makefile.am
+++ b/c/src/ada/Makefile.am
@@ -2,9 +2,8 @@
# $Id$
#
-include_adadir = $(includedir)/adainclude
-
if RTEMS_ADA
+include_adadir = $(includedir)/adainclude
include_ada_HEADERS = rtems.adb rtems.ads
include_ada_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads
endif
@@ -13,11 +12,12 @@ all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
+if RTEMS_ADA
$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
@$(mkdir_p) $(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
@@ -35,4 +35,6 @@ $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: rtems-multiprocessing.a
PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
endif
+CLEANFILES = $(PREINSTALL_FILES)
+
include $(top_srcdir)/automake/local.am