diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-01 13:41:54 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-01 13:41:54 +0000 |
commit | 847dbbe6c70c6695803252b9f5132d777f9df3e7 (patch) | |
tree | e416d082e139ce4bc47ba202e21c1c51c483c233 /c/src/lib/libcpu | |
parent | Removed references to non-existent include files. (diff) | |
download | rtems-847dbbe6c70c6695803252b9f5132d777f9df3e7.tar.bz2 |
Patches rtems-rc-20000118-5.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains:
* The fix for the gen68360/network/Makefile.am
* automatically set permissions to 755 to scripts/buildall and
scripts-ada/buildall (I remembered a trick to achieve this :).
* automake support for libbsp/* and libcpu/* (Attn: This part will
finally break old-style configuration for all non-public cpus)
NOTES:
* This patch has only been tested for a random selection of BSPs (I
haven't rebuilt all toolchains yet).
* This patch is against rtem-cvs as of this morning (MET).
To apply:
patch -p1 <rtems-rc-20000118-5.diff
cvs rm -f ./c/src/lib/libbsp/Makefile.in
cvs rm -f ./c/src/lib/libbsp/shmdr/Makefile.in
cvs rm -f ./c/src/lib/libcpu/Makefile.in
cvs add ./c/src/lib/libbsp/Makefile.am
cvs add ./c/src/lib/libbsp/shmdr/Makefile.am
cvs add ./c/src/lib/libcpu/Makefile.am
./bootstrap
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libcpu/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libcpu/Makefile.in | 41 | ||||
-rw-r--r-- | c/src/lib/libcpu/configure.in | 29 |
3 files changed, 17 insertions, 64 deletions
diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am new file mode 100644 index 0000000000..e1d1694a24 --- /dev/null +++ b/c/src/lib/libcpu/Makefile.am @@ -0,0 +1,11 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +SUBDIRS = @RTEMS_CPU_SUBDIR@ + +include $(top_srcdir)/../../../../automake/subdirs.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/Makefile.in b/c/src/lib/libcpu/Makefile.in deleted file mode 100644 index 9594812447..0000000000 --- a/c/src/lib/libcpu/Makefile.in +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -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@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = $(wildcard $(RTEMS_CPU)) - -#HACK: Don't let them fail here -dist: -distdir: - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && 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/libcpu/configure.in b/c/src/lib/libcpu/configure.in index 616bea9571..715e517fe3 100644 --- a/c/src/lib/libcpu/configure.in +++ b/c/src/lib/libcpu/configure.in @@ -7,37 +7,20 @@ AC_INIT(README) RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) -AC_PROG_MAKE_SET RTEMS_CANONICAL_TARGET_CPU - +AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR -RTEMS_ENABLE_BARE - -RTEMS_ENV_RTEMSBSP - -AC_PROG_INSTALL - 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) - # find all the CPU dependent library Makefiles if test -f $srcdir/$RTEMS_CPU/configure.in; then - cfg_subdirs="$RTEMS_CPU" -else - RTEMS_CHECK_MAKEFILE($RTEMS_CPU) + RTEMS_CPU_SUBDIR="$RTEMS_CPU" fi -AC_CONFIG_SUBDIRS($cfg_subdirs) +AC_SUBST(RTEMS_CPU_SUBDIR) + +AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR) AC_OUTPUT( -Makefile -$makefiles) +Makefile) |