From 70810dcd8970194d96f685ffe4af890911e273c5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 8 Feb 2000 22:33:25 +0000
Subject: Patches rtems-rc-20000204-0.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that contains:

* Removes remaining (now illegal) references to $(SRC) from a couple of
  Makefile.ams
* Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in
* Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR
  from most configure scripts, i.e. LIBCDIR becomes less visible)
* Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to
  libbsp/*/configure.ins (A minor bug in previous implementations, which
  only has an impact when switching to GNU/Cygnus canonicalization)
* Cleans up several bogus comments.
* Removes MKLIB
* Switches the version number to 4.5.0 (for testing version number
  handling)
---
 c/src/libmisc/monitor/Makefile.am | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'c/src/libmisc/monitor')

diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am
index fa9f98db9d..2c8db51ffa 100644
--- a/c/src/libmisc/monitor/Makefile.am
+++ b/c/src/libmisc/monitor/Makefile.am
@@ -1,11 +1,11 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libmonitor-tmp
-LIB = ${ARCH}/$(LIBNAME).a
+LIB = $(ARCH)/$(LIBNAME).a
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = mon-mpci.c
@@ -15,23 +15,17 @@ C_FILES = mon-command.c mon-symbols.c mon-prmisc.c mon-monitor.c \
     mon-dname.c mon-itask.c mon-extension.c mon-manager.c mon-config.c
 
 if HAS_MP
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) $(MP_C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) $(MP_C_FILES:%.c=$(ARCH)/%.o)
 else
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 endif
 
 H_FILES = monitor.h symbols.h
-noinst_HEADERS = $(H_FILES)
 
-SRCS = README $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	$(mkinstalldirs) $@
@@ -42,11 +36,19 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${LIB}: ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
-all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST += $(C_FILES) $(MP_C_FILES)
+EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \
+    mon-extension.c mon-itask.c mon-manager.c mon-monitor.c mon-mpci.c \
+    mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \
+    mon-task.c monitor.h symbols.h
 
 include $(top_srcdir)/../../../automake/local.am
-- 
cgit v1.2.3