From 59909bf4a06815e4132d087f8788fd291416d679 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 14:09:12 +0000 Subject: Patch rtems-rc-20000104-6.diff from Ralf Corsepius that converts the i960 directory to automake. The same kind of libbsp configuration as for the mips64orion, now for the i960. In addition to libbsp configuration this patch also contains two fixes for cvme961.cfg and rxgen960.cfg, which contained non-functional make-exes. (Now both bsps probably have the same issues with linking c++ applications as the gensh2 has, but this is a different open issue not tried to be solved now). The rxgen961 also seems to have problems with its start file, because linking apps fails due to not finding start.o. (Note that libbsp/i960/rxgen960 lacks a start subdirectory!). I leave solving this issue to you :) --- c/src/lib/libbsp/i960/Makefile.am | 12 ++++ c/src/lib/libbsp/i960/Makefile.in | 26 --------- c/src/lib/libbsp/i960/configure.in | 26 +++++++++ c/src/lib/libbsp/i960/cvme961/Makefile.am | 17 ++++++ c/src/lib/libbsp/i960/cvme961/Makefile.in | 31 ----------- c/src/lib/libbsp/i960/cvme961/clock/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/configure.in | 37 ++++++++++++ c/src/lib/libbsp/i960/cvme961/console/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/include/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am | 35 ++++++++++++ c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in | 65 ---------------------- c/src/lib/libbsp/i960/cvme961/start/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/startup/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/timer/Makefile.in | 4 +- c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in | 9 +-- c/src/lib/libbsp/i960/rxgen960/Makefile.am | 17 ++++++ c/src/lib/libbsp/i960/rxgen960/Makefile.in | 31 ----------- c/src/lib/libbsp/i960/rxgen960/clock/Makefile.in | 4 +- c/src/lib/libbsp/i960/rxgen960/configure.in | 36 ++++++++++++ c/src/lib/libbsp/i960/rxgen960/console/Makefile.in | 4 +- c/src/lib/libbsp/i960/rxgen960/include/Makefile.in | 4 +- c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am | 35 ++++++++++++ c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.in | 65 ---------------------- c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in | 4 +- c/src/lib/libbsp/i960/rxgen960/timer/Makefile.in | 4 +- c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.in | 10 +--- 26 files changed, 241 insertions(+), 255 deletions(-) create mode 100644 c/src/lib/libbsp/i960/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/Makefile.in create mode 100644 c/src/lib/libbsp/i960/configure.in create mode 100644 c/src/lib/libbsp/i960/cvme961/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/cvme961/Makefile.in create mode 100644 c/src/lib/libbsp/i960/cvme961/configure.in create mode 100644 c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in create mode 100644 c/src/lib/libbsp/i960/rxgen960/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/rxgen960/Makefile.in create mode 100644 c/src/lib/libbsp/i960/rxgen960/configure.in create mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.in (limited to 'c') diff --git a/c/src/lib/libbsp/i960/Makefile.am b/c/src/lib/libbsp/i960/Makefile.am new file mode 100644 index 0000000000..6e02be9e8e --- /dev/null +++ b/c/src/lib/libbsp/i960/Makefile.am @@ -0,0 +1,12 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +# Descend into the $(RTEMS_BSP_FAMILY) directory +SUBDIRS = $(RTEMS_BSP_FAMILY) + +include $(top_srcdir)/../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/Makefile.in b/c/src/lib/libbsp/i960/Makefile.in deleted file mode 100644 index b0d83326ae..0000000000 --- a/c/src/lib/libbsp/i960/Makefile.in +++ /dev/null @@ -1,26 +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@ - -# Descend into the $(RTEMS_BSP_FAMILY) directory -SUBDIRS = $(RTEMS_BSP_FAMILY) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/configure.in b/c/src/lib/libbsp/i960/configure.in new file mode 100644 index 0000000000..acedf644a1 --- /dev/null +++ b/c/src/lib/libbsp/i960/configure.in @@ -0,0 +1,26 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(cvme961) +RTEMS_TOP(../../../../..) +AC_CONFIG_AUX_DIR(../../../../..) + +RTEMS_CANONICAL_TARGET_CPU +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) + +RTEMS_PROJECT_ROOT +RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) +AC_CONFIG_SUBDIRS($bspdir) + +# try to explicitly list a Makefile here +AC_OUTPUT( +Makefile) diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.am b/c/src/lib/libbsp/i960/cvme961/Makefile.am new file mode 100644 index 0000000000..68e67cb540 --- /dev/null +++ b/c/src/lib/libbsp/i960/cvme961/Makefile.am @@ -0,0 +1,17 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +# wrapup is the one that actually builds and installs the library +# from the individual .rel files built in other directories +SUBDIRS = include start startup clock console shmsupp timer wrapup + +include $(top_srcdir)/../../bsp.am + +EXTRA_DIST = bsp_specs times + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.in b/c/src/lib/libbsp/i960/cvme961/Makefile.in deleted file mode 100644 index abbfc4a4f6..0000000000 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = i960/cvme961 - -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@ - -# We only build the multiprocessing support if HAS_MP was defined -MP_SUPPORT_yes_V = shmsupp -MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) - -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include start startup clock console $(MP_SUPPORT) timer wrapup - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in index 7d1c630de7..e64c3e92bb 100644 --- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in new file mode 100644 index 0000000000..d1e8fd7b77 --- /dev/null +++ b/c/src/lib/libbsp/i960/cvme961/configure.in @@ -0,0 +1,37 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(bsp_specs) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-cvme961,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR +RTEMS_ENABLE_MULTIPROCESSING + +RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") + +# Explicitly list a Makefile here +AC_OUTPUT( +Makefile +clock/Makefile +console/Makefile +include/Makefile +shmsupp/Makefile +start/Makefile +startup/Makefile +timer/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in b/c/src/lib/libbsp/i960/cvme961/console/Makefile.in index 743eca092d..810a0a40a1 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in index 378f32e0df..fbde19af93 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am new file mode 100644 index 0000000000..7932696f8c --- /dev/null +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am @@ -0,0 +1,35 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM = ${ARCH}/shmsupp.rel + +## C source names +C_FILES = addrconv.c getcfg.c lock.c mpisr.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): ${OBJS} + $(make-rel) + +if HAS_MP +all-local: ${ARCH} $(PGM) +else +all-local: +endif + +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +EXTRA_DIST = $(C_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in deleted file mode 100644 index e6a9327f55..0000000000 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/shmsupp - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -PGM = ${ARCH}/shmsupp.rel - -# C source names, if any, go here -- minus the .c -C_PIECES = addrconv getcfg lock mpisr -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_FILES = - -SRCS = $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# (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 += - -$(PGM): ${OBJS} - $(make-rel) - -all: ${ARCH} $(SRCS) $(PGM) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in index 986fc61d6f..722a6ed21b 100644 --- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in index 7dcf31d178..94b1b170e4 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in index fa764cd091..c8101fae5a 100644 --- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in index f39eb80930..3dee44e595 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/cvme961/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -64,11 +64,6 @@ $(LIB): ${OBJS} all: ${ARCH} $(SRCS) $(LIB) $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -install: all - -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs - $(INSTALL_DATA) $< $@ - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/Makefile.am new file mode 100644 index 0000000000..b690f8530a --- /dev/null +++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.am @@ -0,0 +1,17 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +# wrapup is the one that actually builds and installs the library +# from the individual .rel files built in other directories +SUBDIRS = include startup clock console shmsupp timer wrapup + +include $(top_srcdir)/../../bsp.am + +EXTRA_DIST = bsp_specs + +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/Makefile.in deleted file mode 100644 index 354503763b..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = i960/rxgen960 - -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@ - -# We only build the multiprocessing support if HAS_MP was defined -MP_SUPPORT_yes_V = shmsupp -MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V) - -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include startup clock console $(MP_SUPPORT) timer wrapup - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.in index 62c4b394ad..e64c3e92bb 100644 --- a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in new file mode 100644 index 0000000000..9773d67383 --- /dev/null +++ b/c/src/lib/libbsp/i960/rxgen960/configure.in @@ -0,0 +1,36 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(bsp_specs) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-cvme961,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR +RTEMS_ENABLE_MULTIPROCESSING + +RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") + +# Explicitly list a Makefile here +AC_OUTPUT( +Makefile +clock/Makefile +console/Makefile +include/Makefile +shmsupp/Makefile +startup/Makefile +timer/Makefile +wrapup/Makefile) diff --git a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.in index 2883a9f12a..810a0a40a1 100644 --- a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/rxgen960/include/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/include/Makefile.in index 524553d8d4..fbde19af93 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am new file mode 100644 index 0000000000..7932696f8c --- /dev/null +++ b/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am @@ -0,0 +1,35 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM = ${ARCH}/shmsupp.rel + +## C source names +C_FILES = addrconv.c getcfg.c lock.c mpisr.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): ${OBJS} + $(make-rel) + +if HAS_MP +all-local: ${ARCH} $(PGM) +else +all-local: +endif + +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +EXTRA_DIST = $(C_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.in deleted file mode 100644 index 4c76addc0e..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/shmsupp - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -PGM = ${ARCH}/shmsupp.rel - -# C source names, if any, go here -- minus the .c -C_PIECES = addrconv getcfg lock mpisr -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_FILES = - -SRCS = $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# (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 += - -$(PGM): ${OBJS} - $(make-rel) - -all: ${ARCH} $(SRCS) $(PGM) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in index 6eebd6450b..de7e1da02a 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.in index a88e63a19a..2d4617bc72 100644 --- a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.in b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.in index 26779eeaf8..696d850cec 100644 --- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = i960/rxgen960/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -16,7 +16,6 @@ VPATH = @srcdir@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg -INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ BSP_PIECES = startup clock console timer @@ -64,11 +63,6 @@ $(LIB): ${OBJS} all: ${ARCH} $(SRCS) $(LIB) $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -install: all - -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs - $(INSTALL_DATA) $< $@ - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3