From e81cc508c218f3dbdc1d65101286d9a190ee89f9 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 05:21:02 +0000 Subject: 2003-12-12 Ralf Corsepius * Makefile.am: Move include_adadir into RTEMS_ADA condional block. Add CLEANFILES. Add PREINSTALL_FILES to CLEANFILES. --- c/src/ada/ChangeLog | 5 +++++ c/src/ada/Makefile.am | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'c') 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,3 +1,8 @@ +2003-12-12 Ralf Corsepius + + * Makefile.am: Move include_adadir into RTEMS_ADA condional block. + Add CLEANFILES. Add PREINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. 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 -- cgit v1.2.3