diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 08:12:59 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-07-08 08:12:59 +0000 |
| commit | f3f0c916d522ac2ef00b5e6cf76c37e88f3bae5a (patch) | |
| tree | 317f45d22ff31055e4face713d6697860b0425f7 /cpukit | |
| parent | 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f3f0c916d522ac2ef00b5e6cf76c37e88f3bae5a.tar.bz2 | |
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac).
* Makefile.am: Reflect having merged configure.ac into
../configure.ac.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libblock/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 10 | ||||
| -rw-r--r-- | cpukit/libblock/configure.ac | 25 |
3 files changed, 10 insertions, 31 deletions
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index 6787e0b1f3..909931c033 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,9 @@ +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Remove (Merged into ../configure.ac). + * Makefile.am: Reflect having merged configure.ac into + ../configure.ac. + 2003-06-04 Joel Sherrill <joel@OARcorp.com> * src/ide_part_table.c: Removed warnings. diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index 411f1b2561..cbbac6d602 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -2,11 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../aclocal - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am include_rtemsdir = $(includedir)/rtems @@ -41,4 +39,4 @@ $(LIB): ${OBJS} all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libblock/configure.ac b/cpukit/libblock/configure.ac deleted file mode 100644 index e9ed18bedc..0000000000 --- a/cpukit/libblock/configure.ac +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-libblock],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([src/bdbuf.c]) -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU -RTEMS_CANONICAL_HOST - -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSCPU -RTEMS_CHECK_CPU -RTEMS_PROG_CC_FOR_TARGET - -RTEMS_CANONICALIZE_TOOLS -AC_PROG_RANLIB - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT |