summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-15 18:55:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-15 18:55:09 +0000
commit2de2bec8416b1edb26467ba939d8d7bd31233b48 (patch)
treee0edc9fa0a5b0a9523ac3d343c140ba463913fe9 /cpukit
parentac97074f376710b8a4840c14dbfcfa361ff1d012 (diff)
downloadrtems-2de2bec8416b1edb26467ba939d8d7bd31233b48.tar.bz2
2002-03-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Reported and tracked as PR130. * src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX. * wrapup/Makefile.am: Disable dosfs for UNIX.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libfs/ChangeLog6
-rw-r--r--cpukit/libfs/src/dosfs/Makefile.am54
-rw-r--r--cpukit/libfs/wrapup/Makefile.am4
3 files changed, 24 insertions, 40 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index f3cc952246..4bca9696c7 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Reported and tracked as PR130.
+ * src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
+ * wrapup/Makefile.am: Disable dosfs for UNIX.
+
2001-03-01 Joel Sherrill <joel@OARcorp.com>
* src/imfs/.cvsignore: Added stamp-h1.in
diff --git a/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am
index 44c9f4cd2f..16d3a0e20f 100644
--- a/cpukit/libfs/src/dosfs/Makefile.am
+++ b/cpukit/libfs/src/dosfs/Makefile.am
@@ -2,12 +2,14 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-INCLUDES = -I.
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
-LIBNAME = libdosfs
-LIB = ${ARCH}/${LIBNAME}.a
+INCLUDES = -I.
+AM_CFLAGS += $(LIBC_DEFINES)
FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
@@ -16,65 +18,39 @@ DOSFS_C_FILES = msdos_create.c msdos_dir.c msdos_eval.c msdos_file.c \
msdos_handlers_file.c msdos_init.c msdos_initsupp.c \
msdos_misc.c msdos_mknod.c msdos_node_type.c
+if !UNIX
+LIBNAME = libdosfs
+LIB = ${ARCH}/${LIBNAME}.a
-UNIX_C_FILES = msdos_unixstub.c
-
-EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
-
-COMMON_C_FILES =
+C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
-if UNIX
-C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
-else
-C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
-endif
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include_HEADERS = fat.h fat_fat_operations.h \
fat_file.h msdos.h dosfs.h
-SYS_H_FILES =
-RTEMS_H_FILES =
-noinst_HEADERS =
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
- $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
- $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
- $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+H_FILES = $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/sys:
- @$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
- $(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/sys/%.h: %.h
- $(INSTALL_DATA) $< $@
OBJS = $(C_O_FILES)
#
# Add local stuff here using +=
#
-
-AM_CFLAGS += $(LIBC_DEFINES)
-
all-local: ${ARCH} $(LIB)
$(LIB): ${OBJS}
$(make-library)
+endif
-DOC_FILES =
+TMPINSTALL_FILES += $(H_FILES)
-EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
- $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libfs/wrapup/Makefile.am b/cpukit/libfs/wrapup/Makefile.am
index 13406dcb5f..c43d311850 100644
--- a/cpukit/libfs/wrapup/Makefile.am
+++ b/cpukit/libfs/wrapup/Makefile.am
@@ -2,7 +2,7 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
LIBNAME = libfs
LIB = $(ARCH)/$(LIBNAME).a
@@ -13,7 +13,9 @@ include $(top_srcdir)/../../../automake/lib.am
IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
+if !UNIX
DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
+endif
TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)