From 7068e2465b84ff1561ae556a597efed94c86ec2e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 14:29:44 +0000 Subject: Patch rtems-rc-20000104-10.diff from Ralf Corsepius that converts the m68k directory to automake. NOTE: This one is fully tested by building *all* bsps with ../../rtems-rc-20000104/configure \ --target=m68k-rtems \ --prefix=/tmp/rtems \ --enable-cxx \ --disable-posix \ --enable-rdbg \ --disable-networking \ --enable-maintainer-mode \ --enable-multiprocessing \ --disable-tests make --- c/src/lib/libbsp/m68k/mvme136/Makefile.am | 17 ++++++ c/src/lib/libbsp/m68k/mvme136/Makefile.in | 31 ----------- c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/configure.in | 36 +++++++++++++ c/src/lib/libbsp/m68k/mvme136/console/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/include/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am | 35 ++++++++++++ c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in | 65 ----------------------- c/src/lib/libbsp/m68k/mvme136/start/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in | 4 +- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in | 7 +-- 12 files changed, 102 insertions(+), 113 deletions(-) create mode 100644 c/src/lib/libbsp/m68k/mvme136/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/mvme136/Makefile.in create mode 100644 c/src/lib/libbsp/m68k/mvme136/configure.in create mode 100644 c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in (limited to 'c/src/lib/libbsp/m68k/mvme136') diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am new file mode 100644 index 0000000000..f487dfdedd --- /dev/null +++ b/c/src/lib/libbsp/m68k/mvme136/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/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in deleted file mode 100644 index 62544e9c52..0000000000 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = m68k/mvme136 - -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/m68k/mvme136/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in index c81d9d19bb..e64c3e92bb 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/configure.in b/c/src/lib/libbsp/m68k/mvme136/configure.in new file mode 100644 index 0000000000..816548cab2 --- /dev/null +++ b/c/src/lib/libbsp/m68k/mvme136/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-m68k-mvme136,$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_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CANONICAL_HOST + +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes"); + +RTEMS_PROJECT_ROOT + +# 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/m68k/mvme136/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in index 02f04b40f9..810a0a40a1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in index afea83736d..9b7dc2e987 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am new file mode 100644 index 0000000000..7932696f8c --- /dev/null +++ b/c/src/lib/libbsp/m68k/mvme136/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/m68k/mvme136/shmsupp/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in deleted file mode 100644 index acbc538dfc..0000000000 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/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/m68k/mvme136/start/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.in index 19f24bfc0d..fd8f101e0b 100644 --- a/c/src/lib/libbsp/m68k/mvme136/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in index 24474209f1..aaba9f37c7 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in index df70738910..c8101fae5a 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in index 919f4e9653..3dee44e595 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = m68k/mvme136/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -64,9 +64,6 @@ $(LIB): ${OBJS} all: ${ARCH} $(SRCS) $(LIB) $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(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