diff options
-rw-r--r-- | c/src/ada/Makefile.am | 28 | ||||
-rw-r--r-- | c/src/ada/preinstall.am | 35 | ||||
-rw-r--r-- | cpukit/ChangeLog | 6 | ||||
-rw-r--r-- | cpukit/ada/Makefile.am | 28 | ||||
-rw-r--r-- | cpukit/ada/preinstall.am | 35 | ||||
-rw-r--r-- | cpukit/configure.ac | 2 |
6 files changed, 81 insertions, 53 deletions
diff --git a/c/src/ada/Makefile.am b/c/src/ada/Makefile.am index c6b08ce9eb..abbaccd4db 100644 --- a/c/src/ada/Makefile.am +++ b/c/src/ada/Makefile.am @@ -10,33 +10,9 @@ endif all-local: $(PREINSTALL_FILES) -PREINSTALL_DIRS = -PREINSTALL_FILES = - -if RTEMS_ADA -$(PROJECT_INCLUDE)/adainclude/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude - @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp) - -$(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 - CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +include $(srcdir)/preinstall.am + include $(top_srcdir)/automake/local.am diff --git a/c/src/ada/preinstall.am b/c/src/ada/preinstall.am new file mode 100644 index 0000000000..dd58136833 --- /dev/null +++ b/c/src/ada/preinstall.am @@ -0,0 +1,35 @@ +## Automatically generated by ampolish3 - Do not edit + +if AMPOLISH3 +$(srcdir)/preinstall.am: Makefile.am + $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am +endif + +PREINSTALL_DIRS = +DISTCLEANFILES += $(PREINSTALL_DIRS) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) + +if RTEMS_ADA +$(PROJECT_INCLUDE)/adainclude/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude + @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp) + +$(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 diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0e32db59f3..9c19044612 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2005-04-30 Ralf Corsepius <ralf.corsepius@rtems.org> + + * configure.ac: fix evaluating --enable-ada. + * ada/Makefile.am: Use preinstall.am + * ada/preinstall.am: New. + 2005-04-29 Jennifer Averett <jennifer.averett@oarcorp.com> * score/src/objectidtoname.c: Removed warnings diff --git a/cpukit/ada/Makefile.am b/cpukit/ada/Makefile.am index c6b08ce9eb..abbaccd4db 100644 --- a/cpukit/ada/Makefile.am +++ b/cpukit/ada/Makefile.am @@ -10,33 +10,9 @@ endif all-local: $(PREINSTALL_FILES) -PREINSTALL_DIRS = -PREINSTALL_FILES = - -if RTEMS_ADA -$(PROJECT_INCLUDE)/adainclude/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude - @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp) - -$(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 - CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +include $(srcdir)/preinstall.am + include $(top_srcdir)/automake/local.am diff --git a/cpukit/ada/preinstall.am b/cpukit/ada/preinstall.am new file mode 100644 index 0000000000..dd58136833 --- /dev/null +++ b/cpukit/ada/preinstall.am @@ -0,0 +1,35 @@ +## Automatically generated by ampolish3 - Do not edit + +if AMPOLISH3 +$(srcdir)/preinstall.am: Makefile.am + $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am +endif + +PREINSTALL_DIRS = +DISTCLEANFILES += $(PREINSTALL_DIRS) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) + +if RTEMS_ADA +$(PROJECT_INCLUDE)/adainclude/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/adainclude + @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp) + +$(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 diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 7df0e971ff..fb7c2f911b 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -266,7 +266,7 @@ AM_CONDITIONAL(HAS_ITRON,test x"$rtems_cv_HAS_ITRON_API" = x"yes") AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes") AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \ - && test x"$HAS_POSIX_API" = x"yes"]) + && test x"$rtems_cv_HAS_POSIX_API" = x"yes"]) AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"]) AM_CONDITIONAL([NEED_SYS_QUEUE_H],[test x"$NEED_SYS_QUEUE_H" = x"yes"]) |