From c41c8b78b5a38d7890e7d2af32f645369cc0c197 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 8 Jul 2003 09:47:21 +0000 Subject: 2003-07-08 Ralf Corsepius * configure.ac: Remove (Merged-in into ../configure.ac) * Makefile.am, src/Makefile.am, src/dosfs/Makefile.am, src/imfs/Makefile.am: Reflect having merged configure.ac into ../configure.ac. * src/dosfs/config.h: New. * src/dosfs/Makefile.am: Add config.h. * src/imfsfs/config.h: New. * src/imfs/Makefile.am: Add config.h. Remove COMMON_C_FILES, DOC_FILES (Unused). --- cpukit/libfs/ChangeLog | 12 ++++++++++++ cpukit/libfs/Makefile.am | 6 ++---- cpukit/libfs/configure.ac | 34 ---------------------------------- cpukit/libfs/src/Makefile.am | 4 ++-- cpukit/libfs/src/dosfs/Makefile.am | 12 +++++++----- cpukit/libfs/src/dosfs/config.h | 5 +++++ cpukit/libfs/src/imfs/Makefile.am | 23 ++++++++++------------- cpukit/libfs/src/imfs/config.h | 5 +++++ 8 files changed, 43 insertions(+), 58 deletions(-) delete mode 100644 cpukit/libfs/configure.ac create mode 100644 cpukit/libfs/src/dosfs/config.h create mode 100644 cpukit/libfs/src/imfs/config.h diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index 85a759d31b..9ae983c75c 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,15 @@ +2003-07-08 Ralf Corsepius + + * configure.ac: Remove (Merged-in into ../configure.ac) + * Makefile.am, src/Makefile.am, src/dosfs/Makefile.am, + src/imfs/Makefile.am: Reflect having merged configure.ac into + ../configure.ac. + * src/dosfs/config.h: New. + * src/dosfs/Makefile.am: Add config.h. + * src/imfsfs/config.h: New. + * src/imfs/Makefile.am: Add config.h. + Remove COMMON_C_FILES, DOC_FILES (Unused). + 2003-07-08 Ralf Corsepius * src/dosfs/fat.c: include config-header "config.h". diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index f53cfbc96f..780b5e1e08 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -2,11 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../aclocal - SUBDIRS = src EXTRA_DIST = README -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/subdirs.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/configure.ac b/cpukit/libfs/configure.ac deleted file mode 100644 index c7c08cd54b..0000000000 --- a/cpukit/libfs/configure.ac +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-libfs],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([src/imfs/imfs.h]) - -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSCPU - -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST - -RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) -RTEMS_CANONICALIZE_TOOLS -AC_PROG_RANLIB - -AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") -AM_CONFIG_HEADER([config.h]) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -src/Makefile -src/imfs/Makefile -src/dosfs/Makefile -]) -AC_OUTPUT diff --git a/cpukit/libfs/src/Makefile.am b/cpukit/libfs/src/Makefile.am index dff205eaaa..5c6597fb83 100644 --- a/cpukit/libfs/src/Makefile.am +++ b/cpukit/libfs/src/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = imfs dosfs -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/subdirs.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am index f0094a6710..f3adb0868d 100644 --- a/cpukit/libfs/src/dosfs/Makefile.am +++ b/cpukit/libfs/src/dosfs/Makefile.am @@ -3,11 +3,13 @@ ## -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 -AM_CPPFLAGS += -I../.. $(LIBC_DEFINES) +noinst_HEADERS = config.h + +AM_CPPFLAGS += $(LIBC_DEFINES) FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c @@ -50,4 +52,4 @@ TMPINSTALL_FILES += $(H_FILES) EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/dosfs/config.h b/cpukit/libfs/src/dosfs/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libfs/src/dosfs/config.h @@ -0,0 +1,5 @@ +/* HACK: + * Pull-in RTEMS global config-header cpuopts.h as local config.h + */ + +#include diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am index 0f7e631eaf..29174ad04b 100644 --- a/cpukit/libfs/src/imfs/Makefile.am +++ b/cpukit/libfs/src/imfs/Makefile.am @@ -19,22 +19,22 @@ UNIX_C_FILES = imfs_unixstub.c EMBEDDED_C_FILES = $(IMFS_C_FILES) -COMMON_C_FILES = - if UNIX -C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES) +C_FILES = $(UNIX_C_FILES) else -C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES) +C_FILES = $(EMBEDDED_C_FILES) endif OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +noinst_HEADERS = config.h + include_HEADERS = imfs.h -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 -AM_CPPFLAGS += -I../.. $(LIBC_DEFINES) +AM_CPPFLAGS += $(LIBC_DEFINES) PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -54,9 +54,6 @@ all-local: ${ARCH} $(LIB) $(LIB): ${OBJS} $(make-library) -DOC_FILES = TODO CASES - -EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ - $(UNIX_C_FILES) +EXTRA_DIST = $(EMBEDDED_C_FILES) $(UNIX_C_FILES) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/src/imfs/config.h b/cpukit/libfs/src/imfs/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libfs/src/imfs/config.h @@ -0,0 +1,5 @@ +/* HACK: + * Pull-in RTEMS global config-header cpuopts.h as local config.h + */ + +#include -- cgit v1.2.3