From 0ff37e686676453cfa6addb4ddfc71ada9e4c4dd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 7 Jan 2000 14:47:02 +0000 Subject: Patch rtems-rc-20000104-0.diff from Ralf Corsepius which is described below: This one is a (minor) patch in preparation of the upcoming patches. It actually is an excerpt of the upcoming patches and therefore is completely untested in this standalone form, but I don't expect it to break something. The essential changes in this patch are: * An update to rtems-polish.sh (Now can also be run in subdirectories) * A bug-fix for the libcpu/powerpc (A directory was missing from SUBDIRS in a Makefile.am) * An update to gensh2.cfg. * Cleanups/Enhancements to configuration files To apply: cd patch -p0 < rtems-rc-20000104-0.diff cvs rm -f c/src/lib/libbsp/Makefile.am.new --- c/src/lib/libbsp/MERGE.PROCEDURE | 4 ++-- c/src/lib/libbsp/Makefile.am.new | 32 -------------------------------- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 c/src/lib/libbsp/Makefile.am.new (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/MERGE.PROCEDURE b/c/src/lib/libbsp/MERGE.PROCEDURE index 3eabe41f9b..5da81d8582 100644 --- a/c/src/lib/libbsp/MERGE.PROCEDURE +++ b/c/src/lib/libbsp/MERGE.PROCEDURE @@ -58,9 +58,9 @@ tool's configuration applies standard automake Makefile.ams and configure.ins. RTEMS should contain enough examples which could serve as templates for this (My advice: Try to avoid preinstallation and installation to the temporary installation tree whenever possible; Don't -forget to add all sources which do not get installed installed by automake +forget to add all sources which do not get installed by automake to automake's EXTRA_DIST, e.g. noinst_SCRIPTS, noinst_DATA have to be added -to EXTRA_DIST). +to EXTRA_DIST. Please let me know if you meet problems and if we/I can fix them. I consider acpolish to be an internal developer's and maintainer's helper diff --git a/c/src/lib/libbsp/Makefile.am.new b/c/src/lib/libbsp/Makefile.am.new deleted file mode 100644 index 2d234c1d42..0000000000 --- a/c/src/lib/libbsp/Makefile.am.new +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Id$ -# - -AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal - -TMPINSTALL_FILES = \ -$(PROJECT_ROOT)/@RTEMS_BSP@/lib \ -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs - -$(PROJECT_ROOT)/@RTEMS_BSP@/lib: - @$(mkinstalldirs) $@ -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: $(srcdir)/@RTEMS_BSP_SPECS@ - $(INSTALL_DATA) $< $@ - -# shmdr is a portable shared memory MPCI layer -# We only build it if HAS_MP was defined -if HAS_MP -MP_DRIVERS = shmdr -endif - -# If we are building a "real" BSP, then we need to descend into the -# appropriate CPU specific directory. The bare BSP is a special -# case which can be built for any CPU and it resides at the same -# level as the CPUs. If we are building the bare BSP, then descend -# into that directory. - -SUBDIRS = $(MP_DRIVERS) @RTEMS_LIBBSP_CPU_SUBDIR@ - -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3