RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-03-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
Reported and tracked as PR130.
	* src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
	* wrapup/Makefile.am: Disable dosfs for UNIX.
This commit is contained in:
Joel Sherrill
2002-03-15 18:55:09 +00:00
parent ac97074f37
commit 2de2bec841
9 changed files with 72 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/exec/libfs/ChangeLog
View File

@@ -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> 2001-03-01 Joel Sherrill <joel@OARcorp.com>
* src/imfs/.cvsignore: Added stamp-h1.in * src/imfs/.cvsignore: Added stamp-h1.in

54
c/src/exec/libfs/src/dosfs/Makefile.am
View File

@@ -2,12 +2,14 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
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)
LIBNAME = libdosfs
LIB = ${ARCH}/${LIBNAME}.a
FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c 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_handlers_file.c msdos_init.c msdos_initsupp.c \
msdos_misc.c msdos_mknod.c msdos_node_type.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 C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
COMMON_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) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include_HEADERS = fat.h fat_fat_operations.h \ include_HEADERS = fat.h fat_fat_operations.h \
fat_file.h msdos.h dosfs.h fat_file.h msdos.h dosfs.h
SYS_H_FILES =
RTEMS_H_FILES =
noinst_HEADERS =
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg H_FILES = $(PROJECT_INCLUDE) \
include $(top_srcdir)/../../../automake/compile.am $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
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/%)
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
@$(mkinstalldirs) $@ @$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/sys/%.h: %.h
$(INSTALL_DATA) $< $@
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)
# #
# Add local stuff here using += # Add local stuff here using +=
# #
AM_CFLAGS += $(LIBC_DEFINES)
all-local: ${ARCH} $(LIB) all-local: ${ARCH} $(LIB)
$(LIB): ${OBJS} $(LIB): ${OBJS}
$(make-library) $(make-library)
endif
DOC_FILES = TMPINSTALL_FILES += $(H_FILES)
EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
$(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

4
c/src/exec/libfs/wrapup/Makefile.am
View File

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
LIBNAME = libfs LIBNAME = libfs
LIB = $(ARCH)/$(LIBNAME).a LIB = $(ARCH)/$(LIBNAME).a
@@ -13,7 +13,9 @@ include $(top_srcdir)/../../../automake/lib.am
IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
if !UNIX
DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
endif
TMP_LIBS = $(IMFSLIB) $(DOSFSLIB) TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)

6
c/src/libfs/ChangeLog
View File

@@ -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> 2001-03-01 Joel Sherrill <joel@OARcorp.com>
* src/imfs/.cvsignore: Added stamp-h1.in * src/imfs/.cvsignore: Added stamp-h1.in

54
c/src/libfs/src/dosfs/Makefile.am
View File

@@ -2,12 +2,14 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
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)
LIBNAME = libdosfs
LIB = ${ARCH}/${LIBNAME}.a
FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c 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_handlers_file.c msdos_init.c msdos_initsupp.c \
msdos_misc.c msdos_mknod.c msdos_node_type.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 C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
COMMON_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) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include_HEADERS = fat.h fat_fat_operations.h \ include_HEADERS = fat.h fat_fat_operations.h \
fat_file.h msdos.h dosfs.h fat_file.h msdos.h dosfs.h
SYS_H_FILES =
RTEMS_H_FILES =
noinst_HEADERS =
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg H_FILES = $(PROJECT_INCLUDE) \
include $(top_srcdir)/../../../automake/compile.am $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
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/%)
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
@$(mkinstalldirs) $@ @$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/sys/%.h: %.h
$(INSTALL_DATA) $< $@
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)
# #
# Add local stuff here using += # Add local stuff here using +=
# #
AM_CFLAGS += $(LIBC_DEFINES)
all-local: ${ARCH} $(LIB) all-local: ${ARCH} $(LIB)
$(LIB): ${OBJS} $(LIB): ${OBJS}
$(make-library) $(make-library)
endif
DOC_FILES = TMPINSTALL_FILES += $(H_FILES)
EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
$(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

4
c/src/libfs/wrapup/Makefile.am
View File

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
LIBNAME = libfs LIBNAME = libfs
LIB = $(ARCH)/$(LIBNAME).a LIB = $(ARCH)/$(LIBNAME).a
@@ -13,7 +13,9 @@ include $(top_srcdir)/../../../automake/lib.am
IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
if !UNIX
DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
endif
TMP_LIBS = $(IMFSLIB) $(DOSFSLIB) TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)

6
cpukit/libfs/ChangeLog
View File

@@ -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> 2001-03-01 Joel Sherrill <joel@OARcorp.com>
* src/imfs/.cvsignore: Added stamp-h1.in * src/imfs/.cvsignore: Added stamp-h1.in

54
cpukit/libfs/src/dosfs/Makefile.am
View File

@@ -2,12 +2,14 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
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)
LIBNAME = libdosfs
LIB = ${ARCH}/${LIBNAME}.a
FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c 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_handlers_file.c msdos_init.c msdos_initsupp.c \
msdos_misc.c msdos_mknod.c msdos_node_type.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 C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
COMMON_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) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include_HEADERS = fat.h fat_fat_operations.h \ include_HEADERS = fat.h fat_fat_operations.h \
fat_file.h msdos.h dosfs.h fat_file.h msdos.h dosfs.h
SYS_H_FILES =
RTEMS_H_FILES =
noinst_HEADERS =
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg H_FILES = $(PROJECT_INCLUDE) \
include $(top_srcdir)/../../../automake/compile.am $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
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/%)
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
@$(mkinstalldirs) $@ @$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/sys/%.h: %.h
$(INSTALL_DATA) $< $@
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)
# #
# Add local stuff here using += # Add local stuff here using +=
# #
AM_CFLAGS += $(LIBC_DEFINES)
all-local: ${ARCH} $(LIB) all-local: ${ARCH} $(LIB)
$(LIB): ${OBJS} $(LIB): ${OBJS}
$(make-library) $(make-library)
endif
DOC_FILES = TMPINSTALL_FILES += $(H_FILES)
EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
$(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

4
cpukit/libfs/wrapup/Makefile.am
View File

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
LIBNAME = libfs LIBNAME = libfs
LIB = $(ARCH)/$(LIBNAME).a LIB = $(ARCH)/$(LIBNAME).a
@@ -13,7 +13,9 @@ include $(top_srcdir)/../../../automake/lib.am
IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
if !UNIX
DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
endif
TMP_LIBS = $(IMFSLIB) $(DOSFSLIB) TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)