From 362ec23ed72f6fedb1cc78dc867727a75552d9e2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 10 Jan 2000 18:10:59 +0000 Subject: Patch rtems-rc-20000104-12.diff from Ralf Corsepius which converts the PowerPC BSPs to configuration and more automake. * Besides adding partial automake support, rsp converting all powerpc BSPs to make them compliant to the new configuration scheme, this patch attempts to fix several configuration bugs in powerpc related Makefiles. --- c/src/lib/libbsp/powerpc/eth_comm/Makefile.in | 18 +++++-- .../lib/libbsp/powerpc/eth_comm/canbus/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/eth_comm/configure.in | 57 ++++++++++++++++++++++ .../libbsp/powerpc/eth_comm/console/Makefile.in | 4 +- .../libbsp/powerpc/eth_comm/include/Makefile.in | 4 +- .../libbsp/powerpc/eth_comm/network/Makefile.in | 4 +- .../lib/libbsp/powerpc/eth_comm/start/Makefile.in | 4 +- .../libbsp/powerpc/eth_comm/startup/Makefile.in | 4 +- .../lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in | 6 +-- 9 files changed, 87 insertions(+), 18 deletions(-) create mode 100644 c/src/lib/libbsp/powerpc/eth_comm/configure.in (limited to 'c/src/lib/libbsp/powerpc/eth_comm') diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in index ad67de8883..b52e2d5ea3 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in @@ -5,8 +5,12 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = powerpc/eth_comm +top_builddir = . + +ACLOCAL = aclocal +AUTOCONF = autoconf +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -32,4 +36,12 @@ SUBDIRS = include startup start canbus console $(NETWORKING_DRIVER) wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) + cd $(srcdir) && $(AUTOCONF) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in index 97eb820791..59210f05a1 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/canbus +top_builddir = .. +subdir = canbus RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in new file mode 100644 index 0000000000..0b6351347d --- /dev/null +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in @@ -0,0 +1,57 @@ +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 +AC_PROG_MAKE_SET +AC_PROG_INSTALL +AM_MAINTAINER_MODE + +RTEMS_ENABLE_MULTIPROCESSING +RTEMS_ENABLE_NETWORKING +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_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CHECK_NETWORKING(RTEMS_BSP) + +# find all the Makefiles for the BSPs +RTEMS_CHECK_MAKEFILE(.) + +# HACK: sed out bsp-tools from makefiles +t="tools" +if test -d "$srcdir/$t"; then + bsptools_cfgdirs="$bsptools_cfgdirs $t" + makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"` +fi + +if test "$HAS_MP" = "yes"; then +: +else + # HACK: sed out shmsupp/Makefile from makefiles + t="shmsupp" + makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"` +fi +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") + +AC_CONFIG_SUBDIRS($bsptools_cfgdirs) + +# try to explicitly list a Makefile here +AC_OUTPUT( +$makefiles) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in index c2c8b87d4b..810a0a40a1 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in index 843c3614d0..2f69e11804 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in index 06b2475822..15506dfd03 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/network +top_builddir = .. +subdir = network RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in index 77f5be4b45..722a6ed21b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in index 0067135692..79759c63f6 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in index 3f3ee8d796..b94f64e474 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/eth_comm/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -20,7 +20,7 @@ NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) BSP_PIECES = startup start canbus console $(NETWORKING_DRIVER) # pieces to pick up out of libcpu/ppc # CPU_PIECES = mpc860/clock mpc860/timer mpc860/console-generic mpc860/vectors -CPU_PIECES = +CPU_PIECES = GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -- cgit v1.2.3