Miscellaneous patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that are part of the Makefile.am conversion effort but were missed
in the previous commits.

Makefile.am

@@ -13,7 +13,8 @@ SUBDIRS = doc make tools @TARGET_SUBDIRS@
 
 AUTOMAKE_FILES = \
 automake/subdirs.am \
-automake/local.am
+automake/local.am \
+automake/lib.am
 
 ACLOCAL_FILES += \
 aclocal/ar-s.m4 \

aclocal/enable-itron.m4

@@ -2,7 +2,7 @@ dnl $Id$
 
 AC_DEFUN(RTEMS_ENABLE_ITRON,
 [
-AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
+## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
 AC_ARG_ENABLE(itron,
 [  --enable-itron                       enable itron interface],

aclocal/enable-networking.m4

@@ -2,7 +2,7 @@ dnl $Id$
 
 AC_DEFUN(RTEMS_ENABLE_NETWORKING,
 [
-AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
+## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
 AC_ARG_ENABLE(networking,
 [  --enable-networking                  enable TCP/IP stack],

aclocal/enable-posix.m4

@@ -2,7 +2,7 @@ dnl $Id$
 
 AC_DEFUN(RTEMS_ENABLE_POSIX,
 [
-AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
+## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
 AC_ARG_ENABLE(posix,
 [  --enable-posix                       enable posix interface],

c/src/exec/librpc/include/rpc/Makefile.am

@@ -4,14 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if HAS_NETWORKING
 H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h
 
 noinst_HEADERS = $(H_FILES)
 
+if HAS_NETWORKING
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rpc \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rpc/%)
+$(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%)
 
 $(PROJECT_INCLUDE)/rpc:
 	@$(mkinstalldirs) $@

c/src/libchip/network/Makefile.am

@@ -37,13 +37,13 @@ PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/libchip \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
 
-TMPINSTALL_FILES = \
+TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
-$(LIB): $(SRCS) ${OBJS}
+$(LIB): ${OBJS}
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

c/src/libchip/rtc/Makefile.am

@@ -19,14 +19,14 @@ 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
 
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/libchip \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
 
-TMPINSTALL_FILES = \
+TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(PROJECT_INCLUDE)/libchip:
 	@$(mkinstalldirs) $@
@@ -39,10 +39,10 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h
 
 AM_CFLAGS += $(LIBC_DEFINES)
 
-$(LIB): $(SRCS) ${OBJS}
+$(LIB): ${OBJS}
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

c/src/libchip/serial/Makefile.am

@@ -20,14 +20,14 @@ 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
 
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/libchip \
 $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%)
 
-TMPINSTALL_FILES = \
+TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
 $(PROJECT_INCLUDE)/libchip:
 	@$(mkinstalldirs) $@
@@ -40,10 +40,10 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h
 
 AM_CFLAGS += $(LIBC_DEFINES)
 
-$(LIB): $(SRCS) ${OBJS}
+$(LIB): ${OBJS}
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA): $(LIB)
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

c/src/libnetworking/include/Makefile.in

@@ -57,7 +57,8 @@ SRCS = $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(MACHINE_H_FILES) \
     $(NFS_H_FILES) $(RTEMS_SERVERS_H_FILES)
 
 RTEMS_WEBSERVER_H_PIECES = rtems_webserver
-RTEMS_WEBSERVER_H_FILES=$(RTEMS_WEBSERVER_H_PIECES:%=$(srcdir)/../rtems_webserver/%.h)
+RTEMS_WEBSERVER_H_FILES = \
+    $(RTEMS_WEBSERVER_H_PIECES:%=$(srcdir)/../rtems_webserver/%.h)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
@@ -65,10 +66,9 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = $(PROJECT_INCLUDE) \
+INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/sys \
-    $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \
+    $(PROJECT_INCLUDE)/machine $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \
+    $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
-    $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
     $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
 
 $(INSTALLDIRS):

c/src/libnetworking/rtems_webserver/Makefile.in

@@ -6,7 +6,7 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
-subdir = rtems_servers
+subdir = rtems_webserver
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -17,9 +17,9 @@ LIBNAME = lib.a
 LIB = ${ARCH}/${LIBNAME}
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=asp balloc wbase64 default ejlex ejparse form h handler mime \
+C_PIECES = asp balloc wbase64 default ejlex ejparse form h handler mime misc \
-	 misc webpage ringq rom security socket sym uemf url value webcomp \
+    webpage ringq rom security socket sym uemf url value webcomp webrom webs \
-	 webrom webs websuemf webmain
+    websuemf webmain
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 

c/src/libnetworking/wrapup/Makefile.in

@@ -13,7 +13,8 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers $(POSIX_PIECES)
+NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers \
+    $(POSIX_PIECES)
 OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libnetworking.a
 
@@ -21,13 +22,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
+
 HAS_POSIX_API = @HAS_POSIX_API@
 
 ifeq ($(HAS_POSIX),yes)
 POSIX_PIECES = rtems_webserver
 endif 
 
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/librdbg/src/i386/Makefile.am

@@ -8,8 +8,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 SUBDIRS = pc386
 
 EXTRA_DIST = \
-excep_f.c rdbg_cpu_asm.S \
+excep_f.c rdbg_cpu_asm.S rdbg_f.c
-excep.c rdbg_f.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

c/src/librdbg/src/i386/any/Makefile.in

@@ -1,41 +1,115 @@
-#
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
-#  $Id$
+
-#
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+SHELL = @SHELL@
 
-@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
+prefix = @prefix@
-subdir = src/i386/pc386
+exec_prefix = @exec_prefix@
 
-RTEMS_ROOT = @RTEMS_ROOT@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CC_FOR_TARGET = @CC_FOR_TARGET@
+CPP = @CPP@
+GCCSED = @GCCSED@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_RDBG = @HAS_RDBG@
+INSTALL_CHANGE = @INSTALL_CHANGE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKHEX = @PACKHEX@
+PROJECT_INCLUDE = @PROJECT_INCLUDE@
 PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_BSP = @RTEMS_BSP@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
+RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
+RTEMS_HOST = @RTEMS_HOST@
+RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_TOPdir = @RTEMS_TOPdir@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
-LIBNAME = librdbg.a
+LIBNAME = librdbg
-LIB = ${ARCH}/${LIBNAME}
+LIB = ${ARCH}/${LIBNAME}.a
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES = rdbg servcon servbkpt servrpc excep excep_f servtgt servtsp \
+C_FILES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c excep_f.c servtgt.c     servtsp.c servutil.c _servtgt.c rdbg_f.c ptrace.c
-    servutil _servtgt rdbg_f ptrace
 
-C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
 # Asm source names, if any, go here -- minus the .s 
-S_PIECES = rdbg_cpu_asm
+S_FILES = rdbg_cpu_asm.S
-S_FILES = $(S_PIECES:%=%.S)
+S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
 
 # Generated C source names, if any, go here -- minus the .c
-GEN_C_PIECES = remdeb_xdr remdeb_svc
+GEN_C_FILES = remdeb_xdr.c remdeb_svc.c
-GEN_C_FILES = $(GEN_C_PIECES:%=%.c)
+GEN_C_O_FILES = $(GEN_C_PIECES:%.c=${ARCH}/%.o)
-GEN_C_O_FILES = $(GEN_C_PIECES:%=${ARCH}/%.o)
 
 # H source names, if any, go here -- minus the .h
-H_PIECES = remdeb
+H_FILES = remdeb.h
-H_FILES = $(H_PIECES:%=%.h)
 
 # X source names
 X_FILES = remdeb.x remdeb_f.x
@@ -46,25 +120,16 @@ OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
 RPCGEN = @RPCGEN@
 AWK = @AWK@
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
-include $(RTEMS_ROOT)/make/lib.cfg
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = $(PROJECT_INCLUDE)/rdbg
+PREINSTALL_FILES =  $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
 
 #
 # Add local stuff here using +=
 #
 
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -72,15 +137,139 @@ CFLAGS +=
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS += $(LIB) $(H_FILES) $(GEN_C_FILES)
+CLEANFILES =  $(LIB) $(H_FILES) $(GEN_C_FILES)
-CLOBBER_ADDITIONS +=
 
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
-all: ${ARCH} $(LIB)
+EXTRA_DIST = remdeb_f.x
-	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
 
-$(LIB): $(SRCS) ${OBJS}
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../automake/lib.am $(top_srcdir)/../../../automake/local.am
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/i386/pc386/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src/i386/pc386
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/i386/pc386/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
+
+$(PROJECT_INCLUDE)/lib:
+	@$(mkinstalldirs) $@
+
+.PRECIOUS: $(LIB)
+
+$(PROJECT_INCLUDE)/rdbg:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+$(LIB): ${OBJS}
 	$(make-library)
 
 remdeb.h: $(X_FILES)
@@ -88,7 +277,9 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: remdeb.h
+	$(INSTALL_DATA) $< $@
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@
@@ -104,6 +295,22 @@ remdeb_svc.c: $(X_FILES)
 	$(AWK) -f $(srcdir)/../../awk.svc THEPROG="remdeb.h" tmpSvc.c >$@
 	@rm -f tmpSvc.c
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+debug-am:
-	cd $(top_builddir) \
+debug: debug-am
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.PHONY: debug debug-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

c/src/librdbg/src/i386/pc386/Makefile.in

@@ -1,41 +1,115 @@
-#
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
-#  $Id$
+
-#
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+SHELL = @SHELL@
 
-@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
+prefix = @prefix@
-subdir = src/i386/pc386
+exec_prefix = @exec_prefix@
 
-RTEMS_ROOT = @RTEMS_ROOT@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CC_FOR_TARGET = @CC_FOR_TARGET@
+CPP = @CPP@
+GCCSED = @GCCSED@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_RDBG = @HAS_RDBG@
+INSTALL_CHANGE = @INSTALL_CHANGE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKHEX = @PACKHEX@
+PROJECT_INCLUDE = @PROJECT_INCLUDE@
 PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_BSP = @RTEMS_BSP@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
+RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
+RTEMS_HOST = @RTEMS_HOST@
+RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_TOPdir = @RTEMS_TOPdir@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
-LIBNAME = librdbg.a
+LIBNAME = librdbg
-LIB = ${ARCH}/${LIBNAME}
+LIB = ${ARCH}/${LIBNAME}.a
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES = rdbg servcon servbkpt servrpc excep excep_f servtgt servtsp \
+C_FILES = rdbg.c servcon.c servbkpt.c servrpc.c excep.c excep_f.c servtgt.c     servtsp.c servutil.c _servtgt.c rdbg_f.c ptrace.c
-    servutil _servtgt rdbg_f ptrace
 
-C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
 # Asm source names, if any, go here -- minus the .s 
-S_PIECES = rdbg_cpu_asm
+S_FILES = rdbg_cpu_asm.S
-S_FILES = $(S_PIECES:%=%.S)
+S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
 
 # Generated C source names, if any, go here -- minus the .c
-GEN_C_PIECES = remdeb_xdr remdeb_svc
+GEN_C_FILES = remdeb_xdr.c remdeb_svc.c
-GEN_C_FILES = $(GEN_C_PIECES:%=%.c)
+GEN_C_O_FILES = $(GEN_C_PIECES:%.c=${ARCH}/%.o)
-GEN_C_O_FILES = $(GEN_C_PIECES:%=${ARCH}/%.o)
 
 # H source names, if any, go here -- minus the .h
-H_PIECES = remdeb
+H_FILES = remdeb.h
-H_FILES = $(H_PIECES:%=%.h)
 
 # X source names
 X_FILES = remdeb.x remdeb_f.x
@@ -46,25 +120,16 @@ OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
 RPCGEN = @RPCGEN@
 AWK = @AWK@
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
-include $(RTEMS_ROOT)/make/lib.cfg
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = $(PROJECT_INCLUDE)/rdbg
+PREINSTALL_FILES =  $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
 
 #
 # Add local stuff here using +=
 #
 
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -72,15 +137,139 @@ CFLAGS +=
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS += $(LIB) $(H_FILES) $(GEN_C_FILES)
+CLEANFILES =  $(LIB) $(H_FILES) $(GEN_C_FILES)
-CLOBBER_ADDITIONS +=
 
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
-all: ${ARCH} $(LIB)
+EXTRA_DIST = remdeb_f.x
-	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
 
-$(LIB): $(SRCS) ${OBJS}
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../automake/lib.am $(top_srcdir)/../../../automake/local.am
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/i386/pc386/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src/i386/pc386
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/i386/pc386/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
+
+$(PROJECT_INCLUDE)/lib:
+	@$(mkinstalldirs) $@
+
+.PRECIOUS: $(LIB)
+
+$(PROJECT_INCLUDE)/rdbg:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+$(LIB): ${OBJS}
 	$(make-library)
 
 remdeb.h: $(X_FILES)
@@ -88,7 +277,9 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: remdeb.h
+	$(INSTALL_DATA) $< $@
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@
@@ -104,6 +295,22 @@ remdeb_svc.c: $(X_FILES)
 	$(AWK) -f $(srcdir)/../../awk.svc THEPROG="remdeb.h" tmpSvc.c >$@
 	@rm -f tmpSvc.c
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+debug-am:
-	cd $(top_builddir) \
+debug: debug-am
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.PHONY: debug debug-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

c/src/librpc/include/rpc/Makefile.am

@@ -4,14 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if HAS_NETWORKING
 H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h
 
 noinst_HEADERS = $(H_FILES)
 
+if HAS_NETWORKING
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rpc \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rpc/%)
+$(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%)
 
 $(PROJECT_INCLUDE)/rpc:
 	@$(mkinstalldirs) $@

c/src/librpc/src/Makefile.in

@@ -1,58 +1,253 @@
-#
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
-#  $Id$
+
-#
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+SHELL = @SHELL@
 
-@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-LIBNAME = librpc.a
+bindir = @bindir@
-LIB = ${ARCH}/${LIBNAME}
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CC_FOR_TARGET = @CC_FOR_TARGET@
+CPP = @CPP@
+GCCSED = @GCCSED@
+HAS_NETWORKING = @HAS_NETWORKING@
+INSTALL_CHANGE = @INSTALL_CHANGE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKHEX = @PACKHEX@
+PROJECT_INCLUDE = @PROJECT_INCLUDE@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_BSP = @RTEMS_BSP@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
+RTEMS_HOST = @RTEMS_HOST@
+RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_TOPdir = @RTEMS_TOPdir@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librpc
+LIB = ${ARCH}/${LIBNAME}.a
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES = rpc_callmsg rpc_prot svc svc_auth svc_udp xdr xdr_array xdr_mem
+C_FILES = rpc_callmsg.c rpc_prot.c svc.c svc_auth.c svc_udp.c xdr.c     xdr_array.c xdr_mem.c
-C_FILES = $(C_PIECES:%=%.c)
+
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
 SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-include $(RTEMS_ROOT)/make/lib.cfg
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
 
-#
+AM_CFLAGS =  $(LIBC_DEFINES)
-# Add local stuff here using +=
-#
 
-DEFINES +=
+EXTRA_DIST = $(C_FILES)
-CPPFLAGS +=
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
-CFLAGS += $(LIBC_DEFINES)
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
 
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
 
-CLEAN_ADDITIONS += $(LIB)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-CLOBBER_ADDITIONS +=
 
-all: ${ARCH} $(LIB)
+TAR = gtar
-	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../automake/lib.am $(top_srcdir)/../../../automake/local.am
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
 
-$(LIB): $(SRCS) ${OBJS}
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	$(make-library)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
+
+$(PROJECT_INCLUDE)/lib:
+	@$(mkinstalldirs) $@
+
+.PRECIOUS: $(LIB)
+
+$(LIB): ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+debug-am:
+debug: debug-am
+.PHONY: debug debug-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

c/src/librtems++/src/Makefile.in

@@ -1,59 +1,252 @@
-#
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
-#  $Id$
+
-#
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+SHELL = @SHELL@
 
-@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-LIBNAME = librtems++.a
+bindir = @bindir@
-LIB = ${ARCH}/${LIBNAME}
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 
-# C and C++ source names, if any, go here -- minus the .c or .cc
+DESTDIR =
-CC_PIECES = rtemsEvent rtemsInterrupt rtemsMessageQueue rtemsSemaphore \
+
-    rtemsStatusCode rtemsTask rtemsTimer
+pkgdatadir = $(datadir)/@PACKAGE@
-CC_FILES = $(CC_PIECES:%=%.cc)
+pkglibdir = $(libdir)/@PACKAGE@
-CC_O_FILES = $(CC_PIECES:%=${ARCH}/%.o)
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CC_FOR_TARGET = @CC_FOR_TARGET@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXX_FOR_TARGET = @CXX_FOR_TARGET@
+GCCSED = @GCCSED@
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
+INSTALL_CHANGE = @INSTALL_CHANGE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKHEX = @PACKHEX@
+PROJECT_INCLUDE = @PROJECT_INCLUDE@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_BSP = @RTEMS_BSP@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HOST = @RTEMS_HOST@
+RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
+RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_TOPdir = @RTEMS_TOPdir@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librtems++
+LIB = ${ARCH}/${LIBNAME}.a
+
+CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc    rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc
+
+CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o)
 
 SRCS = $(CC_FILES)
 OBJS = $(CC_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-include $(RTEMS_ROOT)/make/lib.cfg
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
 
-#
+AM_CFLAGS =  $(LIBC_DEFINES)
-# Add local stuff here using +=
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
-#
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
 
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
 
-#
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
 
-CLEAN_ADDITIONS += $(LIB)
+TAR = gtar
-CLOBBER_ADDITIONS +=
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../automake/lib.am $(top_srcdir)/../../../automake/local.am
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile
 
-all: ${ARCH} $(LIB)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	@$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
+
+$(PROJECT_INCLUDE)/lib:
+	@$(mkinstalldirs) $@
+
+.PRECIOUS: $(LIB)
+
+$(LIB): ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+debug-am:
+debug: debug-am
+.PHONY: debug debug-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

c/src/make/compilers/gcc-target-default.cfg

@@ -224,7 +224,7 @@ CLOBBER_DEPEND=$(DEPEND)
 # on 'make clean'
 #
 
-depend: $(C_FILES) $(CC_FILES) $(S_FILES)
+depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
 ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
 #       Use gcc -M to generate dependencies
 #       Replace foo.o with $(ARCH)/foo.o
@@ -235,6 +235,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
 	    -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
 	$(MV) $(DEPEND).tmp $(DEPEND)
 endif
+depend: depend-am
 
 # spell out all the LINK_FILE's, rather than using -lbsp, so
 #  that $(LINK_FILES) can be a dependency
@@ -306,5 +307,5 @@ endif
 
 
 define make-rel
-	$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
+	$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^
 endef

c/src/tests/psxtests/Makefile.am

@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SHARED_DIRS = filesupp support
+SHARED_DIRS = support
 
 POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
     psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01

c/src/tests/psxtests/configure.in

@@ -40,7 +40,6 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V)
 # Try to explicitly list a Makefile here
 AC_OUTPUT( 
 Makefile
-filesupp/Makefile
 psx01/Makefile
 psx02/Makefile
 psx03/Makefile

c/src/tests/support/stubdr/Makefile.in

@@ -63,7 +63,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)

c/src/wrapup/Makefile.in

@@ -1,46 +1,227 @@
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
 #
 #  $Id$
 #
 #  build and install "glommed" librtemsall.a
 #
 
-@SET_MAKE@
+
+
+
+SHELL = @SHELL@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
 top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_RDBG = @HAS_RDBG@
+INSTALL_CHANGE = @INSTALL_CHANGE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKHEX = @PACKHEX@
+PROJECT_ROOT = @PROJECT_ROOT@
+RTEMS_BSP = @RTEMS_BSP@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
+RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
+RTEMS_HOST = @RTEMS_HOST@
+RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_TOPdir = @RTEMS_TOPdir@
+VERSION = @VERSION@
+cfg_subdirs = @cfg_subdirs@
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a
+
+
+LIBNAME = librtemsall
+LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a
+
+SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a)     $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a     $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a)     $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a)     $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a     $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a     $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
+
+
+CLEANFILES =  $(ARCH)/check
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../automake/lib.am $(top_srcdir)/../../automake/local.am
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign wrapup/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
 subdir = wrapup
 
-RTEMS_ROOT = @RTEMS_ROOT@
+distdir: $(DISTFILES)
-PROJECT_ROOT = @PROJECT_ROOT@
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign wrapup/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
-VPATH = @srcdir@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
 
-INSTALL_CHANGE = @INSTALL_CHANGE@
+include $(RTEMS_ROOT)/make/leaf.cfg
 
-LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
+define make-library
+$(RM) $@
+$(AR) $(ARFLAGS) $@ $^
+$(RANLIB) $@
+endef
 
-SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
+$(PROJECT_INCLUDE)/lib:
-    $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a $(wildcard \
+	@$(mkinstalldirs) $@
-    $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) $(wildcard \
-    $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a) \
-    $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \
-    $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a $(wildcard \
-    $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
 
-CLEAN_ADDITIONS += $(ARCH)/check
+.PRECIOUS: $(LIB)
-CLOBBER_ADDITIONS +=
 
-all: $(ARCH) $(LIB)
+all: $(ARCH) $(TMPINSTALL_FILES)
 
 install: all
 
@@ -82,6 +263,22 @@ $(LIB): $(ARCH)/check
 	@$(RANLIB) $@
 	@echo "*** Glommed $@"
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+debug-am:
-	cd $(top_builddir) \
+debug: debug-am
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+.PHONY: debug debug-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

cpukit/httpd/Makefile.in

@@ -6,7 +6,7 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
-subdir = rtems_servers
+subdir = rtems_webserver
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -17,9 +17,9 @@ LIBNAME = lib.a
 LIB = ${ARCH}/${LIBNAME}
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=asp balloc wbase64 default ejlex ejparse form h handler mime \
+C_PIECES = asp balloc wbase64 default ejlex ejparse form h handler mime misc \
-	 misc webpage ringq rom security socket sym uemf url value webcomp \
+    webpage ringq rom security socket sym uemf url value webcomp webrom webs \
-	 webrom webs websuemf webmain
+    websuemf webmain
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 

cpukit/librpc/include/rpc/Makefile.am

@@ -4,14 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if HAS_NETWORKING
 H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h
 
 noinst_HEADERS = $(H_FILES)
 
+if HAS_NETWORKING
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rpc \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rpc/%)
+$(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%)
 
 $(PROJECT_INCLUDE)/rpc:
 	@$(mkinstalldirs) $@

make/compilers/gcc-target-default.cfg

@@ -224,7 +224,7 @@ CLOBBER_DEPEND=$(DEPEND)
 # on 'make clean'
 #
 
-depend: $(C_FILES) $(CC_FILES) $(S_FILES)
+depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
 ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
 #       Use gcc -M to generate dependencies
 #       Replace foo.o with $(ARCH)/foo.o
@@ -235,6 +235,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
 	    -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
 	$(MV) $(DEPEND).tmp $(DEPEND)
 endif
+depend: depend-am
 
 # spell out all the LINK_FILE's, rather than using -lbsp, so
 #  that $(LINK_FILES) can be a dependency
@@ -306,5 +307,5 @@ endif
 
 
 define make-rel
-	$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
+	$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^
 endef

make/custom/gensh1.cfg

@@ -36,8 +36,6 @@ CFLAGS_DEBUG_V =
 # -O4 is ok for RTEMS
 CFLAGS_OPTIMIZE_V = -O4 
 
-CPPFLAGS+=$(BSP_CPPFLAGS)
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)

make/custom/pc386.cfg

@@ -96,9 +96,10 @@ define make-exe
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
 	$(NM) -g -n $(basename $@).obj > $(basename $@).num
 	$(SIZE) $(basename $@).obj
-        $(INSTALL_VARIANT) -m 555 $(basename $@).bt ${PROJECT_RELEASE}/BootImgs
+        @$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs
+        $(INSTALL_PROGRAM) $(basename $@).bt ${PROJECT_RELEASE}/BootImgs
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
-	    -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
+	    -o $@ $(LINK_OBJS) $(LINK_LIBS)
 endef
 define make-cxx-exe
 	$(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \

testsuites/psxtests/Makefile.am

@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SHARED_DIRS = filesupp support
+SHARED_DIRS = support
 
 POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
     psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01

tools/update/acpolish

@@ -191,6 +191,10 @@ sub subst_line
      print STDERR "WARNING: Replacing RTEMS_HAS_$2 with HAS_$2\n" ;
      $_ = "$1HAS_$2$3\n" ;
   }
+  if ( /^[\s]*\$[({]PGM[)}]:[\s]*(.*)\$([({]SRCS[)}])(.*)$/o )
+  {                      
+      $_ = "\$(PGM):$1$3\n" ;
+  }
   if ( /^.*\$\(make\-exe\).*$/o )
   {
     $make_exe_seen = 1 ;

tools/update/ampolish

@@ -84,7 +84,14 @@ while( <> )
   }
   elsif ( /^[\s\t]*include[\s\t]*\$\(top_srcdir\)[\.\/]*automake\/(.*)\.am$/o )
   {
-    # remove the line 
+    if ( "$1" eq "lib" )
+    {
+      print "include \$(top_srcdir)/${rtems_top}automake/$1.am\n" ;
+    }
+  }
+  elsif ( /^[\s\t]*include[\s\t]*\$\(RTEMS_ROOT\)\/make\/lib.cfg$/o )
+  {
+    print "include \$(top_srcdir)/${rtems_top}automake/lib.am\n" ;
   }
   elsif ( /^[\s\t]*SUBDIRS.*$/o )
   {