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.
This commit is contained in:
Ralf Corsepius
2004-01-14 05:21:02 +00:00
parent 5c24afe96e
commit e81cc508c2
4 changed files with 20 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
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> 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.

View File

@@ -2,9 +2,8 @@
# $Id$ # $Id$
# #
include_adadir = $(includedir)/adainclude
if RTEMS_ADA if RTEMS_ADA
include_adadir = $(includedir)/adainclude
include_ada_HEADERS = rtems.adb rtems.ads include_ada_HEADERS = rtems.adb rtems.ads
include_ada_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads include_ada_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads
endif endif
@@ -13,11 +12,12 @@ all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES = PREINSTALL_FILES =
if RTEMS_ADA
$(PROJECT_INCLUDE)/adainclude/$(dirstamp): $(PROJECT_INCLUDE)/adainclude/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/adainclude @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude
@: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
if RTEMS_ADA
$(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp) $(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
PREINSTALL_FILES += $(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 PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
endif endif
CLEANFILES = $(PREINSTALL_FILES)
include $(top_srcdir)/automake/local.am include $(top_srcdir)/automake/local.am

View File

@@ -1,3 +1,8 @@
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> 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.

View File

@@ -2,9 +2,8 @@
# $Id$ # $Id$
# #
include_adadir = $(includedir)/adainclude
if RTEMS_ADA if RTEMS_ADA
include_adadir = $(includedir)/adainclude
include_ada_HEADERS = rtems.adb rtems.ads include_ada_HEADERS = rtems.adb rtems.ads
include_ada_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads include_ada_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads
endif endif
@@ -13,11 +12,12 @@ all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES = PREINSTALL_FILES =
if RTEMS_ADA
$(PROJECT_INCLUDE)/adainclude/$(dirstamp): $(PROJECT_INCLUDE)/adainclude/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/adainclude @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude
@: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
if RTEMS_ADA
$(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp) $(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
PREINSTALL_FILES += $(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 PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
endif endif
CLEANFILES = $(PREINSTALL_FILES)
include $(top_srcdir)/automake/local.am include $(top_srcdir)/automake/local.am