summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 06:35:23 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 06:35:23 +0000
commit3e83325e56ae02ab691a1a2ffd5e5291737770a6 (patch)
tree9d15f2a3b9a1d1b7d5bb6870ef7585b0496d95b2
parent8b006a771c8577cb21e6a57e73b54aa1ffa92beb (diff)
downloadrtems-3e83325e56ae02ab691a1a2ffd5e5291737770a6.tar.bz2
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/dosfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and AM_CFLAGS. Eliminate LIBNAME. * src/imfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and AM_CFLAGS. Eliminate LIBNAME. * wrapup/Makefile.am: Eliminate LIBNAME.
-rw-r--r--cpukit/libfs/ChangeLog8
-rw-r--r--cpukit/libfs/src/dosfs/Makefile.am7
-rw-r--r--cpukit/libfs/src/imfs/Makefile.am10
-rw-r--r--cpukit/libfs/wrapup/Makefile.am3
4 files changed, 14 insertions, 14 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 58bb3a4ffe..e9ad75076f 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * src/dosfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and
+ AM_CFLAGS. Eliminate LIBNAME.
+ * src/imfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and
+ AM_CFLAGS. Eliminate LIBNAME.
+ * wrapup/Makefile.am: Eliminate LIBNAME.
+
2002-07-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: RTEMS_TOP(../..).
diff --git a/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am
index 9bb265386a..6f369f1906 100644
--- a/cpukit/libfs/src/dosfs/Makefile.am
+++ b/cpukit/libfs/src/dosfs/Makefile.am
@@ -7,9 +7,7 @@ include $(top_srcdir)/../automake/multilib.am
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/lib.am
-INCLUDES = -I../..
-
-AM_CFLAGS += $(LIBC_DEFINES)
+AM_CPPFLAGS += -I../.. $(LIBC_DEFINES)
FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
@@ -19,8 +17,7 @@ DOSFS_C_FILES = msdos_create.c msdos_dir.c msdos_eval.c msdos_file.c \
msdos_misc.c msdos_mknod.c msdos_node_type.c
if !UNIX
-LIBNAME = libdosfs
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = ${ARCH}/libdosfs.a
C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am
index 760e29025b..28847b42a9 100644
--- a/cpukit/libfs/src/imfs/Makefile.am
+++ b/cpukit/libfs/src/imfs/Makefile.am
@@ -2,11 +2,7 @@
## $Id$
##
-
-INCLUDES = -I../..
-
-LIBNAME = libimfs
-LIB = ${ARCH}/${LIBNAME}.a
+LIB = ${ARCH}/libimfs.a
IMFS_C_FILES = imfs_chown.c imfs_config.c imfs_creat.c imfs_directory.c \
imfs_eval.c imfs_free.c imfs_fsunmount.c imfs_gtkn.c imfs_init.c \
@@ -36,6 +32,8 @@ include $(top_srcdir)/../automake/multilib.am
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/lib.am
+AM_CPPFLAGS += -I../.. $(LIBC_DEFINES)
+
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
@@ -51,8 +49,6 @@ OBJS = $(C_O_FILES)
# Add local stuff here using +=
#
-AM_CFLAGS += $(LIBC_DEFINES)
-
all-local: ${ARCH} $(LIB)
$(LIB): ${OBJS}
diff --git a/cpukit/libfs/wrapup/Makefile.am b/cpukit/libfs/wrapup/Makefile.am
index 87f159d62d..37e922e9b9 100644
--- a/cpukit/libfs/wrapup/Makefile.am
+++ b/cpukit/libfs/wrapup/Makefile.am
@@ -2,8 +2,7 @@
## $Id$
##
-LIBNAME = libfs
-LIB = $(ARCH)/$(LIBNAME).a
+LIB = $(ARCH)/libfs.a
include $(top_srcdir)/../automake/multilib.am
include $(top_srcdir)/../automake/compile.am