summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-12-01 14:12:58 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-12-01 14:12:58 +0000
commit4a3757f71deff891d4b3a85fa817485ba9d8397a (patch)
tree38d88d4fa5d41470d232cc333ba888ddea8fb8f1 /c
parentAdded missing files from PPP port. (diff)
downloadrtems-4a3757f71deff891d4b3a85fa817485ba9d8397a.tar.bz2
Patch rtems-rc-19991123-rc-1.diff from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> which implements automake support for some score/cpu/<RTEMS_CPU> subdirectories and fixes a few minor configuration bugs. To apply: rm -rf c/src/exec/score/cpu/i960/wrap rm -rf c/src/exec/score/cpu/m68k/wrap rm -rf c/src/exec/score/cpu/sh/wrap rm -rf c/src/exec/score/cpu/sparc/wrap rm -rf c/src/exec/score/cpu/unix/wrap patch -p1 < rtems-rc-19991123-rc-1.diff ./bootstrap Known bugs: * "make debug|profile" in c/src/src/score/cpu/<RTEMS_CPU/Makefile does not handle recursion to subdirectories correctly (recurses too often). However, this issue is hardly visible and should be tolerable for the moment.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/score/cpu/i960/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/m68k/wrap/Makefile.in90
2 files changed, 0 insertions, 180 deletions
diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in
deleted file mode 100644
index 2b84329a97..0000000000
--- a/c/src/exec/score/cpu/i960/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = i960/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h i960RP.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm rtems
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# 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 += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in
deleted file mode 100644
index 481a198aa5..0000000000
--- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu memcpy
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h m68302.h m68360.h qsm.h sim.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# 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 += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status