From c31deebf76eaace234811de5a161a027b2cc489d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 20 Mar 2002 14:21:42 +0000 Subject: 2002-03-16 Ralf Corsepius Addressing PR 140. * src/dosfs/config.h.in: Removed. * src/dosfs/stamp-h2.in: Removed. * .cvsignore: Add config.h*, stamp-h*. * configure.ac: Remove AC_SRC_DIR(.../dosfs.h). Remove AM_CONFIG_HEADER(src/dosfs/config.h). Remove AM_CONFIG_HEADER(src/imfs/config.h). Add AM_CONFIG_HEADER(config.h). * src/dosfs/Makefile.am: INCLUDES = -I../.. . * src/imfs/Makefile.am: INCLUDES = -I../.. . --- c/src/exec/libfs/.cvsignore | 2 ++ c/src/exec/libfs/ChangeLog | 13 +++++++++++++ c/src/exec/libfs/configure.ac | 5 ++--- c/src/exec/libfs/src/dosfs/Makefile.am | 3 ++- c/src/exec/libfs/src/imfs/Makefile.am | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) (limited to 'c/src/exec/libfs') diff --git a/c/src/exec/libfs/.cvsignore b/c/src/exec/libfs/.cvsignore index d29e5050f5..ea6e093b99 100644 --- a/c/src/exec/libfs/.cvsignore +++ b/c/src/exec/libfs/.cvsignore @@ -12,3 +12,5 @@ depcomp install-sh missing mkinstalldirs +config.h* +stamp-h* diff --git a/c/src/exec/libfs/ChangeLog b/c/src/exec/libfs/ChangeLog index 4bca9696c7..131b0ba7cc 100644 --- a/c/src/exec/libfs/ChangeLog +++ b/c/src/exec/libfs/ChangeLog @@ -1,3 +1,16 @@ +2002-03-16 Ralf Corsepius + + Addressing PR 140. + * src/dosfs/config.h.in: Removed. + * src/dosfs/stamp-h2.in: Removed. + * .cvsignore: Add config.h*, stamp-h*. + * configure.ac: Remove AC_SRC_DIR(.../dosfs.h). + Remove AM_CONFIG_HEADER(src/dosfs/config.h). + Remove AM_CONFIG_HEADER(src/imfs/config.h). + Add AM_CONFIG_HEADER(config.h). + * src/dosfs/Makefile.am: INCLUDES = -I../.. . + * src/imfs/Makefile.am: INCLUDES = -I../.. . + 2002-03-14 Ralf Corsepius Reported and tracked as PR130. diff --git a/c/src/exec/libfs/configure.ac b/c/src/exec/libfs/configure.ac index 7f36fac28e..215d81b64f 100644 --- a/c/src/exec/libfs/configure.ac +++ b/c/src/exec/libfs/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ(2.52) AC_INIT AC_CONFIG_SRCDIR([src/imfs/imfs.h]) -AC_CONFIG_SRCDIR([src/dosfs/dosfs.h]) + RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) @@ -27,8 +27,7 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") -AM_CONFIG_HEADER(src/imfs/config.h) -AM_CONFIG_HEADER(src/dosfs/config.h) +AM_CONFIG_HEADER(config.h) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/c/src/exec/libfs/src/dosfs/Makefile.am b/c/src/exec/libfs/src/dosfs/Makefile.am index 16d3a0e20f..a3e0dd7a2a 100644 --- a/c/src/exec/libfs/src/dosfs/Makefile.am +++ b/c/src/exec/libfs/src/dosfs/Makefile.am @@ -8,7 +8,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -INCLUDES = -I. +INCLUDES = -I../.. + AM_CFLAGS += $(LIBC_DEFINES) FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c diff --git a/c/src/exec/libfs/src/imfs/Makefile.am b/c/src/exec/libfs/src/imfs/Makefile.am index bd3749c9cb..6cb274c3db 100644 --- a/c/src/exec/libfs/src/imfs/Makefile.am +++ b/c/src/exec/libfs/src/imfs/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -INCLUDES = -I. +INCLUDES = -I../.. LIBNAME = libimfs LIB = ${ARCH}/${LIBNAME}.a -- cgit v1.2.3