Ticket #140: rtems-rc-20020316-2.diff

new file ./c/src/libfs/changes-20020316-2

@@ +1 @@
+2002-03-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        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/libfs/.cvsignore

@@ -12 +12 @@
 install-sh
 missing
 mkinstalldirs
+config.h*
+stamp-h*

./c/src/libfs/configure.ac

@@ -5 +5 @@
 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 +27 @@
 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

./c/src/libfs/src/dosfs/Makefile.am

@@ -8 +8 @@
 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

./c/src/libfs/src/imfs/Makefile.am

@@ -4 +4 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-INCLUDES = -I.
+INCLUDES = -I../..
 
 LIBNAME = libimfs
 LIB = ${ARCH}/${LIBNAME}.a