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/dmv177/Makefile.in | 18 +++++-- c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/configure.in | 57 ++++++++++++++++++++++ .../lib/libbsp/powerpc/dmv177/console/Makefile.in | 4 +- .../lib/libbsp/powerpc/dmv177/include/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in | 4 +- .../lib/libbsp/powerpc/dmv177/startup/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in | 4 +- c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in | 4 +- 12 files changed, 92 insertions(+), 23 deletions(-) create mode 100644 c/src/lib/libbsp/powerpc/dmv177/configure.in (limited to 'c/src/lib/libbsp/powerpc/dmv177') diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in index 9297d39f94..fe17a37367 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in @@ -5,8 +5,12 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = powerpc/dmv177 +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@ @@ -33,4 +37,12 @@ SUBDIRS = include clock console startup start timer scv64 tod \ 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/dmv177/clock/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in index 955f3da65d..643805ea48 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.in b/c/src/lib/libbsp/powerpc/dmv177/configure.in new file mode 100644 index 0000000000..0b6351347d --- /dev/null +++ b/c/src/lib/libbsp/powerpc/dmv177/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/dmv177/console/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in index 0aa9c5e725..066e4958a6 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in index b97fb95f6f..44dea341e7 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in index f303a25dc6..53a1bf210b 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/scv64 +top_builddir = .. +subdir = scv64 RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in index e0ce5fb7dc..2bd3f0fcd4 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/sonic +top_builddir = .. +subdir = sonic RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in index 666647d7a7..e22c3d3ba7 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in index 1f81024852..f060a25721 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in index cb4f76864e..fbad29fdbc 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/timer +top_builddir = .. +subdir = timer RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in index 4044f98462..3275aec0dd 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/tod +top_builddir = .. +subdir = tod RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in index 00ac210122..b9a03b583d 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/dmv177/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -- cgit v1.2.3