From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/librtems++/include/rtems++/Makefile.am | 13 +++++--------
 c/src/librtems++/src/Makefile.am             |  7 +++----
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'c/src/librtems++')

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
diff --git a/c/src/librtems++/src/Makefile.am b/c/src/librtems++/src/Makefile.am
index b4f3d87cca..303584b857 100644
--- a/c/src/librtems++/src/Makefile.am
+++ b/c/src/librtems++/src/Makefile.am
@@ -8,7 +8,7 @@ LIBNAME = librtems++
 LIB = ${ARCH}/${LIBNAME}.a
 
 CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc \
-   rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc
+    rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc
 CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o)
 
 SRCS = $(CC_FILES)
@@ -19,8 +19,7 @@ include $(top_srcdir)/../../../automake/lib.am
 
 AM_CFLAGS += $(LIBC_DEFINES)
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(LIB): ${OBJS}
 	$(make-library)
@@ -28,6 +27,6 @@ $(LIB): ${OBJS}
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
-all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
-- 
cgit v1.2.3