RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Merge wrapup/configure.ac.
	Cosmetic cleanups.
	* Makefile.am: Add wrapup-SUBDIR.
	* wrapup/ChangeLog: Remove.
	* wrapup/configure.ac: Remove.
This commit is contained in:
Ralf Corsepius
2002-08-09 09:47:16 +00:00
parent bac8dd48ab
commit 94f4a9baa2
6 changed files with 44 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge wrapup/configure.ac.
Cosmetic cleanups.
* Makefile.am: Add wrapup-SUBDIR.
* wrapup/ChangeLog: Remove.
* wrapup/configure.ac: Remove.
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Append BARE_CPU_MODEL tp make/@RTEMS_BSP@.cache

2
c/src/Makefile.am
View File

@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I ../../aclocal
SUBDIRS = @exec@ @subdirs@
SUBDIRS = @exec@ @subdirs@ wrapup
clean-local:
$(RM) -r $(PROJECT_RELEASE)

50
c/src/configure.ac
View File

@@ -18,6 +18,9 @@ RTEMS_CANONICAL_HOST
AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
RTEMS_ENABLE_MULTILIB
RTEMS_ENABLE_MULTIPROCESSING
RTEMS_ENV_RTEMSBSP
@@ -60,44 +63,51 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
AC_SUBST(CUSTOM_CFG_FILES)
AC_SUBST(cfg_dir)
## Note: the order of the directories below is essential
AC_CONFIG_SUBDIRS([make])
## Configure ${srcdir}/../../cpukit as exec/ if multilibs are enabled
AS_IF([test x"$multilib" = x"no"],[
RTEMS_CHECK_MULTIPROCESSING
RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],[--with-project-root="../../"])
RTEMS_CONFIG_SUBDIR([exec],[../../cpukit],
[--with-project-root="../../" --enable-rtemsbsp=$RTEMS_BSP
])
AC_SUBST([exec],[exec])
])
AC_CONFIG_SUBDIRS(optman)
AC_CONFIG_SUBDIRS(lib/libcpu)
AC_CONFIG_SUBDIRS(lib/libbsp)
AC_CONFIG_SUBDIRS(libmisc)
## Note: the order of the directories below is essential
AC_CONFIG_SUBDIRS([make])
AC_CONFIG_SUBDIRS([optman])
AC_CONFIG_SUBDIRS([lib/libcpu])
AC_CONFIG_SUBDIRS([lib/libbsp])
AC_CONFIG_SUBDIRS([libmisc])
AS_IF([test "$RTEMS_CPU" != "unix"],[
## HACK: Suppress libchip for unix
AC_CONFIG_SUBDIRS(libchip)
])
if test "$HAS_NETWORKING" = "yes"; then
AS_IF([test "$HAS_NETWORKING" = "yes"],[
AC_CONFIG_SUBDIRS(libnetworking)
if test "$RTEMS_HAS_RDBG" = "yes"; then
AS_IF([test "$RTEMS_HAS_RDBG" = "yes"],[
RTEMS_CHECK_RDBG(RTEMS_BSP)
fi
fi
])
])
if test "$HAS_RDBG" = "yes"; then
AS_IF([test "$HAS_RDBG" = "yes"],[
AC_CONFIG_SUBDIRS(librdbg)
fi
])
AS_IF([test "$RTEMS_HAS_CPLUSPLUS" = "yes"],[
AC_CONFIG_SUBDIRS(librtems++)
])
AC_CONFIG_SUBDIRS(wrapup tests)
AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" )
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
AC_CONFIG_SUBDIRS(librtems++)
fi
AC_CONFIG_SUBDIRS(wrapup tests)
# The bare bsp doesn't have libbsp.a
# FIXME: We should use a feature based check, here
AM_CONDITIONAL(HAS_LIBBSP,[! test "$RTEMS_BSP_FAMILY" = "bare"])
AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
RTEMS_PROJECT_ROOT
@@ -107,4 +117,6 @@ AC_CONFIG_FILES([Makefile],
[RTEMS_BSP=${RTEMS_BSP}
MAKE=${MAKE}])
AC_CONFIG_FILES([wrapup/Makefile])
AC_OUTPUT

102
c/src/wrapup/ChangeLog
View File

@@ -1,102 +0,0 @@
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use @RTEMS_BSP_FAMILY@ instead of $(@RTEMS_BSP_FAMILY).
* configure.ac: Remove RTEMS_BSP_ALIAS.
Add RTEMS_CHECK_BSP_CACHE.
Use RTEMS_BSP_FAMILY to detect the bare BSP.
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AC_CONFIG_SRCDIR([../libmisc]).
2002-07-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove setting up bsplibdir.
2002-07-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: explicitly create $(ARCH) when building $(LIB).
Add bsplib_DATA = $(LIB).
2002-06-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Pickup libbsp.a from build directory.
2002-06-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Pickup libnetapps.a from build directory.
2002-06-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Pickup libmisc.a from build directory.
Remove libxdr.a.
2002-05-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect moving libnetworking. Use libnetapps instead.
2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove libblock, libfs.
2002-05-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove libcsupport.
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac:
AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
AM_INIT_AUTOMAKE([no-define foreign 1.6]).
* Makefile.am: Remove AUTOMAKE_OPTIONS.
2002-03-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Special treatment of the bare BSP.
Add RTEMS_BSP_ALIAS. Add HAS_LIBBSP.
* Makefile.am: Append libbsp.a to SRC conditionally.
2002-02-28 Victor V. Vengerov <vvv@oktet.ru>
* DOS filesystem including FAT12, FAT16, and FAT32 support submitted.
* Makefile.am: Modified to reflect addition.
2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove references to POSIX, ITRON, MULTILIB.
* Makefile.ac: Remove librtems, libposix, libitron. Build
librtemsbsp instead of librtemsall.
2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add AM_CONDITIONAL for enable_multilib,
enable_posix, enable_itron.
* Makefile.am: Compute MULTISUBDIR on-the-fly. Conditionally add
libposix and libitron to SRCS. Apply MULTISUBDIR for picking up
librtems, libposix and libitron.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.
* configure.in: Remove.
* configure.ac: New file, generated from configure.in by autoupdate.
2001-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove subshell from *.a processing in librtemsall.a
rule.
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Switch to ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal.
2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: New file.
* Makefile.am: Switch to GNU-canonicalized autoconf macros.
* configure.in: New file.
* .cvsignore: Add aclocal.m4, configure.

10
c/src/wrapup/Makefile.am
View File

@@ -4,11 +4,9 @@
## build and install "glommed" librtemsbsp.a
##
ACLOCAL_AMFLAGS = -I ../../../aclocal
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
include $(top_srcdir)/../../automake/compile.am
include $(top_srcdir)/../../automake/lib.am
LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
@@ -32,7 +30,7 @@ SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \
../libmisc/wrapup/$(ARCH)/libmisc.a \
$(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
TMPINSTALL_FILES += $(LIB)
all-local: $(ARCH) $(TMPINSTALL_FILES)
@@ -69,4 +67,4 @@ $(LIB): $(SRCS)
bsplib_DATA = $(LIB)
include $(top_srcdir)/../../../automake/local.am
include $(top_srcdir)/../../automake/local.am

48
c/src/wrapup/configure.ac
View File

@@ -1,48 +0,0 @@
## Process this file with autoconf to produce a configure script.
##
## $Id$
AC_PREREQ(2.52)
AC_INIT([rtems-c-src-wrapup],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([../libmisc])
RTEMS_TOP(../../..)
AC_CONFIG_AUX_DIR(../../..)
RTEMS_ENABLE_NETWORKING
RTEMS_ENABLE_RDBG
RTEMS_CANONICAL_TARGET_CPU
RTEMS_CANONICAL_HOST
AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
RTEMS_ENABLE_MULTILIB
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CPU
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
# The bare bsp doesn't have libbsp.a
# FIXME: We should use a feature based check, here
AM_CONDITIONAL(HAS_LIBBSP,[! test "$RTEMS_BSP_FAMILY" = "bare"])
RTEMS_CHECK_NETWORKING(RTEMS_BSP)
if test "$HAS_NETWORKING" = "yes"; then
if test "$RTEMS_HAS_RDBG" = "yes"; then
RTEMS_CHECK_RDBG(RTEMS_BSP)
fi
fi
AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" )
RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
AC_OUTPUT