From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/librtems++/include/rtems++/Makefile.am | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'c/src/librtems++/include') diff --git a/c/src/librtems++/include/rtems++/Makefile.am b/c/src/librtems++/include/rtems++/Makefile.am index 67ace61e70..e7f2f0a836 100644 --- a/c/src/librtems++/include/rtems++/Makefile.am +++ b/c/src/librtems++/include/rtems++/Makefile.am @@ -5,14 +5,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 if HAS_CXX -H_FILES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h \ - rtemsSemaphore.h rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h +H_FILES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h rtemsSemaphore.h \ + rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems++ \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++ \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%) $(PROJECT_INCLUDE)/rtems++: @$(mkinstalldirs) $@ @@ -20,8 +19,6 @@ $(PROJECT_INCLUDE)/rtems++/%.h: %.h $(INSTALL_DATA) $< $@ endif -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3