diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-12-01 14:22:12 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-12-01 14:22:12 +0000 |
commit | ccf8925b45d1ff1f9bb23eba2d4606837ca6202c (patch) | |
tree | 29a3e6681c22bbc0658893af7d55ac1e34775535 /c/src/exec/score | |
parent | Patch rtems-rc-19991123-rc-1.diff from Ralf Corsepius (diff) | |
download | rtems-ccf8925b45d1ff1f9bb23eba2d4606837ca6202c.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/src/exec/score')
36 files changed, 651 insertions, 629 deletions
diff --git a/c/src/exec/score/cpu/configure.in b/c/src/exec/score/cpu/configure.in index 5a83394fba..de885e607e 100644 --- a/c/src/exec/score/cpu/configure.in +++ b/c/src/exec/score/cpu/configure.in @@ -44,7 +44,13 @@ if test "$HAS_MP" = "yes"; then fi # find all the Executive Makefiles +if test -f $srcdir/$RTEMS_CPU/configure; then +cfg_subdirs="$RTEMS_CPU" +else RTEMS_CHECK_MAKEFILE($RTEMS_CPU) +fi + +AC_CONFIG_SUBDIRS($cfg_subdirs) AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes") diff --git a/c/src/exec/score/cpu/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am new file mode 100644 index 0000000000..5dfd2a4303 --- /dev/null +++ b/c/src/exec/score/cpu/i960/Makefile.am @@ -0,0 +1,53 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +SUBDIRS = rtems + +# C source names +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +H_FILES = asm.h i960RP.h +noinst_HEADERS = $(H_FILES) + +# S source names +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(H_FILES:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +REL = $(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + $(make-rel) + +all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) + +EXTRA_DIST = \ +cpu.c \ +cpu_asm.S \ +rtems.S + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in deleted file mode 100644 index a7d8e221d0..0000000000 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = i960 - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = rtems wrap - -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/i960/configure.in b/c/src/exec/score/cpu/i960/configure.in new file mode 100644 index 0000000000..6eb18eab01 --- /dev/null +++ b/c/src/exec/score/cpu/i960/configure.in @@ -0,0 +1,40 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cpu_asm.S) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i960,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_NEWLIB + +# Check if there is custom/*.cfg for this BSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) + +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +# Try to explicitly list a Makefile here +AC_OUTPUT( +Makefile +rtems/Makefile +rtems/score/Makefile) diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.am b/c/src/exec/score/cpu/i960/rtems/Makefile.am new file mode 100644 index 0000000000..900930a502 --- /dev/null +++ b/c/src/exec/score/cpu/i960/rtems/Makefile.am @@ -0,0 +1,10 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = score + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in deleted file mode 100644 index e16f379a56..0000000000 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = i960/rtems - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = score - -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/i960/rtems/score/Makefile.am b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am new file mode 100644 index 0000000000..9614ab9e49 --- /dev/null +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am @@ -0,0 +1,26 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +H_FILES = cpu.h i960.h i960types.h +noinst_HEADERS = $(H_FILES) + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE)/rtems/score \ +$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in deleted file mode 100644 index fcc6c532e6..0000000000 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rtems/score - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_PIECES = cpu.h i960.h i960types.h -H_FILES = $(H_PIECES:%=$(srcdir)/%) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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)/rtems/score - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -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 += -CLOBBER_ADDITIONS += $(BUILT_SOURCES) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -all: preinstall - -preinstall: $(INSTALLDIRS) $(H_FILES) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score - -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/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am new file mode 100644 index 0000000000..307eefc86e --- /dev/null +++ b/c/src/exec/score/cpu/m68k/Makefile.am @@ -0,0 +1,53 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +SUBDIRS = rtems + +# C source names +C_FILES = cpu.c memcpy.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +H_FILES = asm.h m68302.h m68360.h qsm.h sim.h +noinst_HEADERS = $(H_FILES) + +# S source names +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(H_FILES:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +REL = $(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + $(make-rel) + +all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) + +EXTRA_DIST = \ +cpu.c memcpy.c \ +cpu_asm.S \ +rtems.S + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in deleted file mode 100644 index 13ba612f57..0000000000 --- a/c/src/exec/score/cpu/m68k/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = m68k - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = rtems wrap - -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/configure.in b/c/src/exec/score/cpu/m68k/configure.in new file mode 100644 index 0000000000..9906bfd2ef --- /dev/null +++ b/c/src/exec/score/cpu/m68k/configure.in @@ -0,0 +1,40 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cpu_asm.S) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-m68k,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_NEWLIB + +# Check if there is custom/*.cfg for this BSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) + +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +# Try to explicitly list a Makefile here +AC_OUTPUT( +Makefile +rtems/Makefile +rtems/score/Makefile) diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/Makefile.am new file mode 100644 index 0000000000..900930a502 --- /dev/null +++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.am @@ -0,0 +1,10 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = score + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in deleted file mode 100644 index 5cc6fcd10c..0000000000 --- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = m68k/rtems - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = score - -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/rtems/score/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am new file mode 100644 index 0000000000..5be89730ec --- /dev/null +++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am @@ -0,0 +1,26 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +H_FILES = cpu.h m68k.h m68ktypes.h +noinst_HEADERS = $(H_FILES) + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE)/rtems/score \ +$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in deleted file mode 100644 index 868e0af8cd..0000000000 --- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/rtems/score - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_PIECES = cpu.h m68k.h m68ktypes.h -H_FILES = $(H_PIECES:%=$(srcdir)/%) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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)/rtems/score - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -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 += -CLOBBER_ADDITIONS += $(BUILT_SOURCES) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -all: preinstall - -preinstall: $(INSTALLDIRS) $(H_FILES) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score - -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/sh/Makefile.am b/c/src/exec/score/cpu/sh/Makefile.am new file mode 100644 index 0000000000..e03b4aaff3 --- /dev/null +++ b/c/src/exec/score/cpu/sh/Makefile.am @@ -0,0 +1,51 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +SUBDIRS = rtems + +H_FILES = asm.h +noinst_HEADERS = $(H_FILES) + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(H_FILES:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +# C source names, if any, go here -- minus the .c +C_FILES = cpu.c cpu_asm.c isp$(RTEMS_CPU_MODEL).c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) + $(make-rel) + +all: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) + +EXTRA_DIST = \ +cpu.c \ +cpu_asm.c \ +ispsh7032.c \ +ispsh7045.c \ +rtems.c + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in deleted file mode 100644 index 820f1dcfc6..0000000000 --- a/c/src/exec/score/cpu/sh/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = sh - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = rtems wrap - -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/sh/configure.in b/c/src/exec/score/cpu/sh/configure.in new file mode 100644 index 0000000000..46afcfd04c --- /dev/null +++ b/c/src/exec/score/cpu/sh/configure.in @@ -0,0 +1,40 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cpu_asm.c) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sh,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_NEWLIB + +# Check if there is custom/*.cfg for this BSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) + +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +# Try to explicitly list a Makefile here +AC_OUTPUT( +Makefile +rtems/Makefile +rtems/score/Makefile) diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.am b/c/src/exec/score/cpu/sh/rtems/Makefile.am new file mode 100644 index 0000000000..900930a502 --- /dev/null +++ b/c/src/exec/score/cpu/sh/rtems/Makefile.am @@ -0,0 +1,10 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = score + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in deleted file mode 100644 index 0ce0681963..0000000000 --- a/c/src/exec/score/cpu/sh/rtems/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = sh/rtems - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = score - -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/sh/rtems/score/Makefile.am b/c/src/exec/score/cpu/sh/rtems/score/Makefile.am new file mode 100644 index 0000000000..cd110b7fc8 --- /dev/null +++ b/c/src/exec/score/cpu/sh/rtems/score/Makefile.am @@ -0,0 +1,34 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +H_FILES = cpu.h shtypes.h sh.h sh_io.h isp$(RTEMS_CPU_MODEL).h \ + io$(RTEMS_CPU_MODEL).h +noinst_HEADERS = \ + cpu.h shtypes.h sh.h sh_io.h \ + iosh7032.h ispsh7032.h \ + iosh7045.h ispsh7045.h + +## HACK: this should not be here +## Currently needed to get RTEMS_CPU_MODEL +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE)/rtems/score \ +$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in deleted file mode 100644 index 72b3471072..0000000000 --- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in +++ /dev/null @@ -1,75 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = sh/rtems/score - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_PIECES = cpu.h shtypes.h sh.h sh_io.h isp$(RTEMS_CPU_MODEL).h \ - io$(RTEMS_CPU_MODEL).h -H_FILES = $(H_PIECES:%=$(srcdir)/%) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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)/rtems/score - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -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 += -CLOBBER_ADDITIONS += $(BUILT_SOURCES) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -all: preinstall - -preinstall: $(INSTALLDIRS) $(H_FILES) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score - -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/sparc/Makefile.am b/c/src/exec/score/cpu/sparc/Makefile.am new file mode 100644 index 0000000000..b3c1176884 --- /dev/null +++ b/c/src/exec/score/cpu/sparc/Makefile.am @@ -0,0 +1,53 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +SUBDIRS = rtems + +# C source names +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +H_FILES = asm.h erc32.h +noinst_HEADERS = $(H_FILES) + +# S source names +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(H_FILES:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +REL = $(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + $(make-rel) + +all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) + +EXTRA_DIST = \ +cpu.c \ +cpu_asm.S \ +rtems.S + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in deleted file mode 100644 index 0d89a0f51b..0000000000 --- a/c/src/exec/score/cpu/sparc/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = sparc - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = rtems wrap - -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/sparc/configure.in b/c/src/exec/score/cpu/sparc/configure.in new file mode 100644 index 0000000000..ac8fd7f289 --- /dev/null +++ b/c/src/exec/score/cpu/sparc/configure.in @@ -0,0 +1,40 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cpu_asm.S) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_NEWLIB + +# Check if there is custom/*.cfg for this BSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) + +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +# Try to explicitly list a Makefile here +AC_OUTPUT( +Makefile +rtems/Makefile +rtems/score/Makefile) diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.am b/c/src/exec/score/cpu/sparc/rtems/Makefile.am new file mode 100644 index 0000000000..900930a502 --- /dev/null +++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.am @@ -0,0 +1,10 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = score + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in deleted file mode 100644 index 0cd9e3af8b..0000000000 --- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = sparc/rtems - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = score - -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/sparc/rtems/score/Makefile.am b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am new file mode 100644 index 0000000000..602dce7cd5 --- /dev/null +++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am @@ -0,0 +1,26 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +H_FILES = cpu.h sparc.h sparctypes.h +noinst_HEADERS = $(H_FILES) + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE)/rtems/score \ +$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in deleted file mode 100644 index 8ab5f8f199..0000000000 --- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = sparc/rtems/score - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_PIECES = cpu.h sparctypes.h sparc.h -H_FILES = $(H_PIECES:%=$(srcdir)/%) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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)/rtems/score - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -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 += -CLOBBER_ADDITIONS += $(BUILT_SOURCES) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -all: preinstall - -preinstall: $(INSTALLDIRS) $(H_FILES) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score - -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/unix/Makefile.am b/c/src/exec/score/cpu/unix/Makefile.am new file mode 100644 index 0000000000..d55b67a02c --- /dev/null +++ b/c/src/exec/score/cpu/unix/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +SUBDIRS = rtems + +AM_CPPFLAGS = -DCPU_SYNC_IO $(LIBC_DEFINES) + +# C source names, if any, go here -- minus the .c +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) + $(make-rel) + +all-local: $(ARCH) $(REL) $(TMPINSTALL_FILES) + +EXTRA_DIST = \ +cpu.c + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in deleted file mode 100644 index efef7da8aa..0000000000 --- a/c/src/exec/score/cpu/unix/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = unix - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = rtems wrap - -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/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in new file mode 100644 index 0000000000..e9ee7b9b9f --- /dev/null +++ b/c/src/exec/score/cpu/unix/configure.in @@ -0,0 +1,47 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cpu.c) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-unix,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR +RTEMS_ENABLE_MULTIPROCESSING + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +# Check if there is custom/*.cfg for this BSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) + +RTEMS_CHECK_NEWLIB +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) + +# The only use of System V IPC is the UNIX port when multiprocessing. +if test "$HAS_MP" = "yes"; then + RTEMS_CHECK_SYSV_UNIX +fi + +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +# Try to explicitly list a Makefile here +AC_OUTPUT( +Makefile +rtems/Makefile +rtems/score/Makefile) diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.am b/c/src/exec/score/cpu/unix/rtems/Makefile.am new file mode 100644 index 0000000000..900930a502 --- /dev/null +++ b/c/src/exec/score/cpu/unix/rtems/Makefile.am @@ -0,0 +1,10 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = score + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in deleted file mode 100644 index 8cc26059bd..0000000000 --- a/c/src/exec/score/cpu/unix/rtems/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = unix/rtems - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = score - -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/unix/rtems/score/Makefile.am b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am new file mode 100644 index 0000000000..06c1e6e614 --- /dev/null +++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am @@ -0,0 +1,36 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +GENSIZE = $(PROJECT_ROOT)/tools/cpu/unix/gensize + +GENERIC_H_FILES = unixsize.h +STATIC_H_FILES = cpu.h unixtypes.h unix.h +noinst_HEADERS = $(STATIC_H_FILES) + +# +# (OPTIONAL) Add local stuff here using += +# + +unixsize.h: $(GENSIZE) cpu.h + $(RM) $@ + $(GENSIZE) > $@ + +CLEANFILES = unixsize.h + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE)/rtems/score \ +$(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ +$(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in deleted file mode 100644 index 6e5eae9723..0000000000 --- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in +++ /dev/null @@ -1,82 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = unix/rtems/score - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -GENSIZE = $(PROJECT_ROOT)/tools/cpu/unix/gensize - -BUILT_SOURCES = unixsize.h - -# C source names, if any, go here -- minus the .c -C_PIECES = -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_PIECES = cpu.h unixtypes.h unix.h -H_FILES = $(H_PIECES:%=$(srcdir)/%) unixsize.h - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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)/rtems/score - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -LD_PATHS += -LD_LIBS += -LDFLAGS += - -unixsize.h: $(GENSIZE) cpu.h - $(RM) $@ - $(GENSIZE) > $@ - -# -# 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 += -CLOBBER_ADDITIONS += $(BUILT_SOURCES) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -all: preinstall - -preinstall: $(INSTALLDIRS) $(H_FILES) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status |