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)
---
 cpukit/itron/src/Makefile.am        |  1 -
 cpukit/libmisc/cpuuse/Makefile.am   | 29 ++++++++++++++---------------
 cpukit/libmisc/monitor/Makefile.am  | 34 ++++++++++++++++++----------------
 cpukit/libmisc/rtmonuse/Makefile.am | 29 ++++++++++++++---------------
 cpukit/libmisc/stackchk/Makefile.am | 29 ++++++++++++++---------------
 cpukit/libmisc/untar/Makefile.am    | 29 ++++++++++++++---------------
 cpukit/libmisc/wrapup/Makefile.am   | 27 +++++++++++++--------------
 cpukit/posix/src/Makefile.am        |  3 +--
 cpukit/rtems/src/Makefile.am        |  3 +--
 cpukit/sapi/src/Makefile.am         |  1 -
 cpukit/score/src/Makefile.am        |  1 -
 11 files changed, 89 insertions(+), 97 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/itron/src/Makefile.am b/cpukit/itron/src/Makefile.am
index 7e5d47eee2..f508440f60 100644
--- a/cpukit/itron/src/Makefile.am
+++ b/cpukit/itron/src/Makefile.am
@@ -43,7 +43,6 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
     $(TIME_C_FILES)
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
index d3bd220f54..542eae4bab 100644
--- a/cpukit/libmisc/cpuuse/Makefile.am
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -1,27 +1,21 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libcpuuse-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = cpuuse.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = cpuuse.h
-noinst_HEADERS = $(H_FILES)
 
-SRCS = $(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) $@
@@ -32,11 +26,16 @@ $(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)
+EXTRA_DIST = README cpuuse.c cpuuse.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index fa9f98db9d..2c8db51ffa 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/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
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
index e701353a1f..76f7f19acd 100644
--- a/cpukit/libmisc/rtmonuse/Makefile.am
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -1,27 +1,21 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = librtmonuse-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = rtmonuse.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = rtmonuse.h
-noinst_HEADERS = $(H_FILES)
 
-SRCS = $(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) $@
@@ -32,11 +26,16 @@ $(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)
+EXTRA_DIST = rtmonuse.c rtmonuse.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
index e5f467c42a..83dd699c85 100644
--- a/cpukit/libmisc/stackchk/Makefile.am
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -1,28 +1,22 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libstackchk-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = check.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = internal.h
 INSTALLED_H_FILES = stackchk.h
-noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES)
 
-SRCS = $(C_FILES) $(H_FILES) $(INSTALLED_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 \
-$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,11 +27,16 @@ $(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 \
+    $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST += $(C_FILES)
+EXTRA_DIST = README check.c internal.h stackchk.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
index 33badae971..6bb36617a3 100644
--- a/cpukit/libmisc/untar/Makefile.am
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -1,27 +1,21 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libuntar-tmp
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = untar.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = untar.h
-noinst_HEADERS = $(H_FILES)
 
-SRCS = $(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) $@
@@ -32,11 +26,16 @@ $(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)
+EXTRA_DIST = README untar.c untar.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am
index d5021a7be0..5d43b326b3 100644
--- a/cpukit/libmisc/wrapup/Makefile.am
+++ b/cpukit/libmisc/wrapup/Makefile.am
@@ -1,23 +1,20 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libmisc
-LIB = ${ARCH}/$(LIBNAME).a
+LIB = $(ARCH)/$(LIBNAME).a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
-TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \
-    ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
-    ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
+TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
+    ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
+    ../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
     ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
@@ -29,12 +26,14 @@ $(LIB): $(TMP_LIBS)
 	$(RM) $@
 	$(RM) -r $(ARCH)
 	mkdir $(ARCH)
-	cd $(ARCH); for lib in $^; do \
-                         $(AR) -xv ../$$lib; \
-                    done
+	cd $(ARCH); for lib in $^; do $(AR) -xv ../$$lib; done
 	$(AR) ruv $@ $(ARCH)/*
 	$(RANLIB) $@
 
-all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(LIB)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/posix/src/Makefile.am b/cpukit/posix/src/Makefile.am
index 9f00dce8a5..63fd5adc0f 100644
--- a/cpukit/posix/src/Makefile.am
+++ b/cpukit/posix/src/Makefile.am
@@ -81,7 +81,6 @@ C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
     $(BUILD_FOR_NOW_C_FILES) utsname.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -94,7 +93,7 @@ include $(top_srcdir)/../../../../automake/lib.am
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 AM_CFLAGS += $(CFLAGS_OS_V)
 
-all: ${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} ${OBJS}
 
 # temporary so we can see how many things are left to implement
 not: 
diff --git a/cpukit/rtems/src/Makefile.am b/cpukit/rtems/src/Makefile.am
index ddf816a050..16d932dc9d 100644
--- a/cpukit/rtems/src/Makefile.am
+++ b/cpukit/rtems/src/Makefile.am
@@ -63,7 +63,6 @@ endif
 
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 #
@@ -73,7 +72,7 @@ OBJS = $(C_O_FILES)
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 AM_CFLAGS += $(CFLAGS_OS_V)
 
-all: ${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} ${OBJS}
 
 EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
 
diff --git a/cpukit/sapi/src/Makefile.am b/cpukit/sapi/src/Makefile.am
index d4c32b0ee7..91d461279c 100644
--- a/cpukit/sapi/src/Makefile.am
+++ b/cpukit/sapi/src/Makefile.am
@@ -8,7 +8,6 @@ C_FILES = debug.c entrytable.c extension.c fatal.c exinit.c io.c itronapi.c \
     posixapi.c rtemsapi.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/cpukit/score/src/Makefile.am b/cpukit/score/src/Makefile.am
index facf739415..f5914fdb37 100644
--- a/cpukit/score/src/Makefile.am
+++ b/cpukit/score/src/Makefile.am
@@ -64,7 +64,6 @@ C_FILES = $(STD_C_FILES)
 endif
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 #
-- 
cgit v1.2.3