summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--aclocal/enable-itron.m42
-rw-r--r--aclocal/enable-networking.m42
-rw-r--r--aclocal/enable-posix.m42
-rw-r--r--c/src/exec/librpc/include/rpc/Makefile.am4
-rw-r--r--c/src/libchip/network/Makefile.am8
-rw-r--r--c/src/libchip/rtc/Makefile.am10
-rw-r--r--c/src/libchip/serial/Makefile.am10
-rw-r--r--c/src/libnetworking/include/Makefile.in12
-rw-r--r--c/src/libnetworking/rtems_webserver/Makefile.in8
-rw-r--r--c/src/libnetworking/wrapup/Makefile.in7
-rw-r--r--c/src/librdbg/src/i386/Makefile.am3
-rw-r--r--c/src/librdbg/src/i386/any/Makefile.in287
-rw-r--r--c/src/librdbg/src/i386/pc386/Makefile.in287
-rw-r--r--c/src/librpc/include/rpc/Makefile.am4
-rw-r--r--c/src/librpc/src/Makefile.in265
-rw-r--r--c/src/librtems++/src/Makefile.in267
-rw-r--r--c/src/make/compilers/gcc-target-default.cfg5
-rw-r--r--c/src/tests/psxtests/Makefile.am2
-rw-r--r--c/src/tests/psxtests/configure.in1
-rw-r--r--c/src/tests/support/stubdr/Makefile.in2
-rw-r--r--c/src/wrapup/Makefile.in251
-rw-r--r--cpukit/httpd/Makefile.in8
-rw-r--r--cpukit/librpc/include/rpc/Makefile.am4
-rw-r--r--make/compilers/gcc-target-default.cfg5
-rw-r--r--make/custom/gensh1.cfg2
-rw-r--r--make/custom/pc386.cfg5
-rw-r--r--testsuites/psxtests/Makefile.am2
-rwxr-xr-xtools/update/acpolish4
-rwxr-xr-xtools/update/ampolish9
30 files changed, 1246 insertions, 235 deletions
diff --git a/Makefile.am b/Makefile.am
index 45d3b9b9e4..0f771983d8 100644
--- a/Makefile.am
+++ b/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 \
diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4
index 9ce17c1c72..da2bb89974 100644
--- a/aclocal/enable-itron.m4
+++ b/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],
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index 995e3da9f9..958f03030d 100644
--- a/aclocal/enable-networking.m4
+++ b/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],
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index ee2d9fd37f..12fe119c5f 100644
--- a/aclocal/enable-posix.m4
+++ b/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],
diff --git a/c/src/exec/librpc/include/rpc/Makefile.am b/c/src/exec/librpc/include/rpc/Makefile.am
index 49b4706d1e..5ca801b3c9 100644
--- a/c/src/exec/librpc/include/rpc/Makefile.am
+++ b/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) $@
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am
index 52f13482da..674e3c2b56 100644
--- a/c/src/libchip/network/Makefile.am
+++ b/c/src/libchip/network/Makefile.am
@@ -37,13 +37,13 @@ PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/libchip \
$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
-TMPINSTALL_FILES = \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+TMPINSTALL_FILES += \
+$(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)
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
index 4c5b210624..79b73b60af 100644
--- a/c/src/libchip/rtc/Makefile.am
+++ b/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 = \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+TMPINSTALL_FILES += \
+$(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)
diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am
index 2f4a16f697..6e70ca107c 100644
--- a/c/src/libchip/serial/Makefile.am
+++ b/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 = \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBSUFFIX_VA)
+TMPINSTALL_FILES += \
+$(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)
diff --git a/c/src/libnetworking/include/Makefile.in b/c/src/libnetworking/include/Makefile.in
index 9cdb3c1005..1883f24a38 100644
--- a/c/src/libnetworking/include/Makefile.in
+++ b/c/src/libnetworking/include/Makefile.in
@@ -56,8 +56,9 @@ SRCS = $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(MACHINE_H_FILES) \
$(VM_H_FILES) $(NET_H_FILES) $(NETINET_H_FILES) $(ARPA_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_PIECES = rtems_webserver
+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) \
- $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \
- $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \
- $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
+INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/sys \
+ $(PROJECT_INCLUDE)/machine $(PROJECT_INCLUDE)/rtems \
+ $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
$(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
$(INSTALLDIRS):
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.in b/c/src/libnetworking/rtems_webserver/Makefile.in
index 392760195b..5285ea204d 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.in
+++ b/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 \
- misc webpage ringq rom security socket sym uemf url value webcomp \
- webrom webs websuemf webmain
+C_PIECES = asp balloc wbase64 default ejlex ejparse form h handler mime misc \
+ webpage ringq rom security socket sym uemf url value webcomp webrom webs \
+ websuemf webmain
C_FILES = $(C_PIECES:%=%.c)
C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
diff --git a/c/src/libnetworking/wrapup/Makefile.in b/c/src/libnetworking/wrapup/Makefile.in
index b546f6ea12..951646a3df 100644
--- a/c/src/libnetworking/wrapup/Makefile.in
+++ b/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,12 +22,12 @@ 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
-
+endif
#
# (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am
index 0d44f9e427..768d0aeb21 100644
--- a/c/src/librdbg/src/i386/Makefile.am
+++ b/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.c rdbg_f.c
+excep_f.c rdbg_cpu_asm.S rdbg_f.c
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/src/i386/any/Makefile.in b/c/src/librdbg/src/i386/any/Makefile.in
index 5e96cfb584..3d90fa53e4 100644
--- a/c/src/librdbg/src/i386/any/Makefile.in
+++ b/c/src/librdbg/src/i386/any/Makefile.in
@@ -1,41 +1,115 @@
-#
-# $Id$
-#
+# 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.
+
+
+
+
+SHELL = @SHELL@
-@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_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 = ../../..
-subdir = src/i386/pc386
-RTEMS_ROOT = @RTEMS_ROOT@
+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
-LIB = ${ARCH}/${LIBNAME}
+LIBNAME = librdbg
+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 \
- servutil _servtgt rdbg_f ptrace
+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
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
# Asm source names, if any, go here -- minus the .s
-S_PIECES = rdbg_cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
+S_FILES = rdbg_cpu_asm.S
+S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
# Generated C source names, if any, go here -- minus the .c
-GEN_C_PIECES = remdeb_xdr remdeb_svc
-GEN_C_FILES = $(GEN_C_PIECES:%=%.c)
-GEN_C_O_FILES = $(GEN_C_PIECES:%=${ARCH}/%.o)
+GEN_C_FILES = remdeb_xdr.c remdeb_svc.c
+GEN_C_O_FILES = $(GEN_C_PIECES:%.c=${ARCH}/%.o)
# H source names, if any, go here -- minus the .h
-H_PIECES = remdeb
-H_FILES = $(H_PIECES:%=%.h)
+H_FILES = remdeb.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
-include $(RTEMS_ROOT)/make/lib.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
-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)
-CLOBBER_ADDITIONS +=
+CLEANFILES = $(LIB) $(H_FILES) $(GEN_C_FILES)
FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
-all: ${ARCH} $(LIB)
- @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+EXTRA_DIST = remdeb_f.x
+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 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
-$(LIB): $(SRCS) ${OBJS}
+
+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
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+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:
diff --git a/c/src/librdbg/src/i386/pc386/Makefile.in b/c/src/librdbg/src/i386/pc386/Makefile.in
index 5e96cfb584..3d90fa53e4 100644
--- a/c/src/librdbg/src/i386/pc386/Makefile.in
+++ b/c/src/librdbg/src/i386/pc386/Makefile.in
@@ -1,41 +1,115 @@
-#
-# $Id$
-#
+# 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.
+
+
+
+
+SHELL = @SHELL@
-@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_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 = ../../..
-subdir = src/i386/pc386
-RTEMS_ROOT = @RTEMS_ROOT@
+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
-LIB = ${ARCH}/${LIBNAME}
+LIBNAME = librdbg
+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 \
- servutil _servtgt rdbg_f ptrace
+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
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
# Asm source names, if any, go here -- minus the .s
-S_PIECES = rdbg_cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
+S_FILES = rdbg_cpu_asm.S
+S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
# Generated C source names, if any, go here -- minus the .c
-GEN_C_PIECES = remdeb_xdr remdeb_svc
-GEN_C_FILES = $(GEN_C_PIECES:%=%.c)
-GEN_C_O_FILES = $(GEN_C_PIECES:%=${ARCH}/%.o)
+GEN_C_FILES = remdeb_xdr.c remdeb_svc.c
+GEN_C_O_FILES = $(GEN_C_PIECES:%.c=${ARCH}/%.o)
# H source names, if any, go here -- minus the .h
-H_PIECES = remdeb
-H_FILES = $(H_PIECES:%=%.h)
+H_FILES = remdeb.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
-include $(RTEMS_ROOT)/make/lib.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
-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)
-CLOBBER_ADDITIONS +=
+CLEANFILES = $(LIB) $(H_FILES) $(GEN_C_FILES)
FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
-all: ${ARCH} $(LIB)
- @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+EXTRA_DIST = remdeb_f.x
+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 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
-$(LIB): $(SRCS) ${OBJS}
+
+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
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+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:
diff --git a/c/src/librpc/include/rpc/Makefile.am b/c/src/librpc/include/rpc/Makefile.am
index 49b4706d1e..5ca801b3c9 100644
--- a/c/src/librpc/include/rpc/Makefile.am
+++ b/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) $@
diff --git a/c/src/librpc/src/Makefile.in b/c/src/librpc/src/Makefile.in
index 10d1c14b89..79489d87c1 100644
--- a/c/src/librpc/src/Makefile.in
+++ b/c/src/librpc/src/Makefile.in
@@ -1,58 +1,253 @@
-#
-# $Id$
-#
+# 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.
+
+
+
+
+SHELL = @SHELL@
-@SET_MAKE@
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 = ..
-subdir = src
-RTEMS_ROOT = @RTEMS_ROOT@
+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@
-VPATH = @srcdir@
+AUTOMAKE_OPTIONS = foreign 1.4
-LIBNAME = librpc.a
-LIB = ${ARCH}/${LIBNAME}
+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 = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
+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_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-INSTALL_CHANGE = @INSTALL_CHANGE@
-#
-# Add local stuff here using +=
-#
+AM_CFLAGS = $(LIBC_DEFINES)
+
+EXTRA_DIST = $(C_FILES)
+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 src/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:
+
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-#
-# 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'
-#
+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."
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
+maintainer-clean: maintainer-clean-am
-all: ${ARCH} $(LIB)
- $(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+.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
-$(LIB): $(SRCS) ${OBJS}
+
+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)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+$(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:
diff --git a/c/src/librtems++/src/Makefile.in b/c/src/librtems++/src/Makefile.in
index aadf9ab9b4..98635b9ffe 100644
--- a/c/src/librtems++/src/Makefile.in
+++ b/c/src/librtems++/src/Makefile.in
@@ -1,59 +1,252 @@
-#
-# $Id$
-#
+# 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.
+
+
+
+
+SHELL = @SHELL@
-@SET_MAKE@
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 = ..
-subdir = src
-RTEMS_ROOT = @RTEMS_ROOT@
+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@
-VPATH = @srcdir@
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librtems++
+LIB = ${ARCH}/${LIBNAME}.a
-LIBNAME = librtems++.a
-LIB = ${ARCH}/${LIBNAME}
+CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc
-# C and C++ source names, if any, go here -- minus the .c or .cc
-CC_PIECES = rtemsEvent rtemsInterrupt rtemsMessageQueue rtemsSemaphore \
- rtemsStatusCode rtemsTask rtemsTimer
-CC_FILES = $(CC_PIECES:%=%.cc)
-CC_O_FILES = $(CC_PIECES:%=${ARCH}/%.o)
+CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o)
SRCS = $(CC_FILES)
OBJS = $(CC_O_FILES)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
+TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-INSTALL_CHANGE = @INSTALL_CHANGE@
-#
-# Add local stuff here using +=
-#
+AM_CFLAGS = $(LIBC_DEFINES)
+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'
-#
+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/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
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
+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
-all: ${ARCH} $(LIB)
- @$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+install-data-am:
+install-data: install-data-am
-$(LIB): $(SRCS) ${OBJS}
+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)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+$(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:
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
index 92ba1637ce..653f93ed0d 100644
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ b/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
diff --git a/c/src/tests/psxtests/Makefile.am b/c/src/tests/psxtests/Makefile.am
index 8f4ed05e3f..95d7b19f0d 100644
--- a/c/src/tests/psxtests/Makefile.am
+++ b/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
diff --git a/c/src/tests/psxtests/configure.in b/c/src/tests/psxtests/configure.in
index 1bfc92e781..6900397421 100644
--- a/c/src/tests/psxtests/configure.in
+++ b/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
diff --git a/c/src/tests/support/stubdr/Makefile.in b/c/src/tests/support/stubdr/Makefile.in
index 6fb632948a..27f97de305 100644
--- a/c/src/tests/support/stubdr/Makefile.in
+++ b/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)
diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in
index 483fdda4cd..0ab6fd2c55 100644
--- a/c/src/wrapup/Makefile.in
+++ b/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 = ..
-subdir = wrapup
-RTEMS_ROOT = @RTEMS_ROOT@
+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
+
+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 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_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)
+$(PROJECT_INCLUDE)/lib:
+ @$(mkinstalldirs) $@
-CLEAN_ADDITIONS += $(ARCH)/check
-CLOBBER_ADDITIONS +=
+.PRECIOUS: $(LIB)
-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
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+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:
diff --git a/cpukit/httpd/Makefile.in b/cpukit/httpd/Makefile.in
index 392760195b..5285ea204d 100644
--- a/cpukit/httpd/Makefile.in
+++ b/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 \
- misc webpage ringq rom security socket sym uemf url value webcomp \
- webrom webs websuemf webmain
+C_PIECES = asp balloc wbase64 default ejlex ejparse form h handler mime misc \
+ webpage ringq rom security socket sym uemf url value webcomp webrom webs \
+ websuemf webmain
C_FILES = $(C_PIECES:%=%.c)
C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
diff --git a/cpukit/librpc/include/rpc/Makefile.am b/cpukit/librpc/include/rpc/Makefile.am
index 49b4706d1e..5ca801b3c9 100644
--- a/cpukit/librpc/include/rpc/Makefile.am
+++ b/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) $@
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index 92ba1637ce..653f93ed0d 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/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
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index 5dc58d8e82..f4145d2609 100644
--- a/make/custom/gensh1.cfg
+++ b/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)
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index 503143c63d..ff3fd21ee9 100644
--- a/make/custom/pc386.cfg
+++ b/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) \
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 8f4ed05e3f..95d7b19f0d 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/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
diff --git a/tools/update/acpolish b/tools/update/acpolish
index 1fe933cfec..5de711f60c 100755
--- a/tools/update/acpolish
+++ b/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 ;
diff --git a/tools/update/ampolish b/tools/update/ampolish
index 1fb5c3341f..265a3bc76c 100755
--- a/tools/update/ampolish
+++ b/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 )
{