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)

4 files changed, 23 insertions, 30 deletions

diff --git a/c/src/libchip/configure.in b/c/src/libchip/configure.in
index e7d2d5a9be..ebe580d377 100644
--- a/c/src/libchip/configure.in
+++ b/c/src/libchip/configure.in
@@ -12,7 +12,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-libchip,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_LIBCDIR
 RTEMS_ENABLE_BARE
 
 RTEMS_ENV_RTEMSBSP
@@ -22,7 +21,6 @@ RTEMS_CANONICAL_HOST
 
 RTEMS_PROJECT_ROOT
 
-dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
@@ -37,7 +35,7 @@ fi
 
 AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes")
 
-# try to explicitly list a Makefile here 
+# Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
 network/Makefile
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am
index 77d262a170..55962bdffe 100644
--- a/c/src/libchip/network/Makefile.am
+++ b/c/src/libchip/network/Makefile.am
@@ -1,23 +1,21 @@
-#
-# $Id$
-#
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libnetchip
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = $(ARCH)/$(LIBNAME).a
 
 C_FILES = dec21140.c sonic.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = sonic.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
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/libchip:
 	@$(mkinstalldirs) $@
@@ -28,29 +26,28 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h
 # Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-AM_CFLAGS += $(LIBC_DEFINES)
-
-if HAS_NETWORKING
-
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/libchip \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
-
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+AM_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+AM_CFLAGS = $(LIBC_DEFINES)
 
-$(LIB): ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
-all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+if HAS_NETWORKING
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \
+    $(PROJECT_INCLUDE)/libchip/sonic.h
+endif
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
+if HAS_NETWORKING
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 endif
 
-EXTRA_DIST = README README.sonic
-EXTRA_DIST += $(C_FILES)
+.PRECIOUS: $(LIB)
+
+EXTRA_DIST = README README.dec21140 README.sonic dec21140.c sonic.c sonic.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
index 79b73b60af..c2ec59470d 100644
--- a/c/src/libchip/rtc/Makefile.am
+++ b/c/src/libchip/rtc/Makefile.am
@@ -15,7 +15,6 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 H_FILES = rtc.h icm7170.h m48t08.h
 noinst_HEADERS = $(H_FILES)
 
-SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -50,6 +49,6 @@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 DOC_FILES = \
 README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS
 
-EXTRA_DIST += $(C_FILES) $(DOC_FILES)
+EXTRA_DIST = $(C_FILES) $(DOC_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am
index 6e70ca107c..3e860df828 100644
--- a/c/src/libchip/serial/Makefile.am
+++ b/c/src/libchip/serial/Makefile.am
@@ -16,7 +16,6 @@ H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h
 INSTALLED_H_FILES = mc68681.h ns16550.h z85c30.h serial.h
 noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES)
 
-SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -51,6 +50,6 @@ all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 DOC_FILES = \
 README.mc68681 README.ns16550 README.xr88681 README.z85c30 STATUS
 
-EXTRA_DIST += $(C_FILES) $(DOC_FILES)
+EXTRA_DIST = $(C_FILES) $(DOC_FILES)
 
 include $(top_srcdir)/../../../automake/local.am