From 9ba1f0a79efa6efb3cc9360dec61708f3db6da8a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 21 Dec 1999 15:04:48 +0000 Subject: Patch rtems-rc-19991203-9.diff from Ralf Corsepius which ontains all what was left over from the other patches (Primarily minor configuration cleanups). To apply: patch -p1 < rtems-rc-19991203-9.diff ./bootstrap --- c/src/exec/score/include/rtems/score/Makefile.am | 7 ------- c/src/lib/libbsp/bare/Makefile.am | 3 --- c/src/lib/libbsp/configure.in | 8 ++++---- c/src/librdbg/src/i386/any/Makefile.am | 7 ------- c/src/librdbg/src/powerpc/mcp750/Makefile.am | 7 ------- c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am | 7 ------- c/src/tests/samples/base_mp/node1/Makefile.am | 7 ------- c/src/tests/samples/base_mp/node2/Makefile.am | 7 ------- 8 files changed, 4 insertions(+), 49 deletions(-) (limited to 'c') diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am index 995cd3a01d..4507d51b33 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.am +++ b/c/src/exec/score/include/rtems/score/Makefile.am @@ -33,13 +33,6 @@ $(PROJECT_INCLUDE)/rtems/score: $(PROJECT_INCLUDE)/rtems/score/%.h: %.h $(INSTALL_DATA) $< $@ -# -# 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' -# - CLEANFILES += $(TARGOPTS) # Until RTEMS_CPU is removed from all the make configuration files, diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am index d8a5abe2d3..4c1ea45a78 100644 --- a/c/src/lib/libbsp/bare/Makefile.am +++ b/c/src/lib/libbsp/bare/Makefile.am @@ -12,9 +12,6 @@ SUBDIRS = . include $(PROJECT_RELEASE)/bsp_specs: bsp_specs $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += \ -$(PROJECT_RELEASE)/bsp_specs - all-local : $(PREINSTALL_FILES) EXTRA_DIST = \ diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in index 424021eee4..3db27b9f9b 100644 --- a/c/src/lib/libbsp/configure.in +++ b/c/src/lib/libbsp/configure.in @@ -32,9 +32,6 @@ dnl if this is an i386, does gas have good code16 support? RTEMS_I386_GAS_CODE16 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes"); -# find all the Makefiles for the BSPs -makefiles="$makefiles $RTEMS_CPU/Makefile" - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP) @@ -64,6 +61,9 @@ else RTEMS_LIBBSP_CPU_SUBDIR='$(RTEMS_CPU)' fi AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR) + +# find all the Makefiles for the BSPs +makefiles="$makefiles $RTEMS_CPU/Makefile" if test -d "$srcdir/$bspcpudir$bspdir"; then RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir) @@ -89,10 +89,10 @@ fi AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") AC_CONFIG_SUBDIRS($bsptools_cfgdirs) + if test "$RTEMS_BSP" = "bare"; then cfg_subdirs="bare" fi - AC_CONFIG_SUBDIRS($cfg_subdirs) # try to explicitly list a Makefile here diff --git a/c/src/librdbg/src/i386/any/Makefile.am b/c/src/librdbg/src/i386/any/Makefile.am index 45bb35c04a..2bbc2499e7 100644 --- a/c/src/librdbg/src/i386/any/Makefile.am +++ b/c/src/librdbg/src/i386/any/Makefile.am @@ -47,13 +47,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a # Add local stuff here using += # -# -# 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' -# - CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES) FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\" diff --git a/c/src/librdbg/src/powerpc/mcp750/Makefile.am b/c/src/librdbg/src/powerpc/mcp750/Makefile.am index b0d5a37384..014355c690 100644 --- a/c/src/librdbg/src/powerpc/mcp750/Makefile.am +++ b/c/src/librdbg/src/powerpc/mcp750/Makefile.am @@ -47,13 +47,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a # Add local stuff here using += # -# -# 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' -# - CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES) FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\" diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am index b0d5a37384..014355c690 100644 --- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am +++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am @@ -47,13 +47,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a # Add local stuff here using += # -# -# 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' -# - CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES) FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\" diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am index 6ef095fbaa..cbf7be44ea 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.am +++ b/c/src/tests/samples/base_mp/node1/Makefile.am @@ -38,13 +38,6 @@ if HAS_MP AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. -# -# 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' -# - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am index 9473b08070..6448ad517f 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.am +++ b/c/src/tests/samples/base_mp/node2/Makefile.am @@ -38,13 +38,6 @@ if HAS_MP AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. -# -# 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' -# - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -- cgit v1.2.3