From 8917506d1c1f80a5b157b4e137fc8dd0a3ba2319 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Oct 2001 18:51:47 +0000 Subject: 2001-10-16 Ralf Corsepius * include/rtems++/Makefile.am: Remove. * include/Makefile.am: Handle subdirs, require automake-1.5. * configure.ac: Reflect changes above. * Makefile.am: Require automake-1.5. --- c/src/librtems++/ChangeLog | 7 +++++++ c/src/librtems++/Makefile.am | 2 +- c/src/librtems++/configure.ac | 1 - c/src/librtems++/include/Makefile.am | 24 +++++++++++++++++++++--- c/src/librtems++/include/rtems++/Makefile.am | 23 ----------------------- 5 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 c/src/librtems++/include/rtems++/Makefile.am diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 2e49f310d4..589814a5f5 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,10 @@ +2001-10-16 Ralf Corsepius + + * include/rtems++/Makefile.am: Remove. + * include/Makefile.am: Handle subdirs, require automake-1.5. + * configure.ac: Reflect changes above. + * Makefile.am: Require automake-1.5. + 2001-10-11 Ralf Corsepius * .cvsignore: Add autom4te.cache for autoconf > 2.52. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index aeba0379b6..797f9cd127 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../aclocal SUBDIRS = include src diff --git a/c/src/librtems++/configure.ac b/c/src/librtems++/configure.ac index e6f34c03d6..23f91bdc66 100644 --- a/c/src/librtems++/configure.ac +++ b/c/src/librtems++/configure.ac @@ -34,7 +34,6 @@ RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile include/Makefile -include/rtems++/Makefile src/Makefile ]) AC_OUTPUT diff --git a/c/src/librtems++/include/Makefile.am b/c/src/librtems++/include/Makefile.am index 540e68ec55..1230c5b701 100644 --- a/c/src/librtems++/include/Makefile.am +++ b/c/src/librtems++/include/Makefile.am @@ -2,9 +2,27 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems++ +include_rtems__dir = $(includedir)/rtems++ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/rtems++: + @$(mkinstalldirs) $@ + +if HAS_CXX +include_rtems___HEADERS = rtems++/rtemsEvent.h \ + rtems++/rtemsInterrupt.h rtems++/rtemsMessageQueue.h rtems++/rtemsSemaphore.h \ + rtems++/rtemsStatusCode.h rtems++/rtemsTask.h rtems++/rtemsTaskMode.h \ + rtems++/rtemsTimer.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \ + $(include_rtems___HEADERS:%=$(PROJECT_INCLUDE)/%) + +endif + +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librtems++/include/rtems++/Makefile.am b/c/src/librtems++/include/rtems++/Makefile.am deleted file mode 100644 index 06bfdba6a9..0000000000 --- a/c/src/librtems++/include/rtems++/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -if HAS_CXX -include_rtems__dir = $(includedir)/rtems++ -include_rtems___HEADERS = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h rtemsSemaphore.h \ - rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \ - $(include_rtems___HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%) - -$(PROJECT_INCLUDE)/rtems++: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems++/%.h: %.h - $(INSTALL_DATA) $< $@ -endif - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3