Changeset 2de2bec in rtems


Ignore:
Timestamp:
Mar 15, 2002, 6:55:09 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
dee576c
Parents:
ac97074f
Message:

2002-03-14 Ralf Corsepius <corsepiu@…>

Reported and tracked as PR130.

  • src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
  • wrapup/Makefile.am: Disable dosfs for UNIX.
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/libfs/ChangeLog

    rac97074f r2de2bec  
     12002-03-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        Reported and tracked as PR130.
     4        * src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
     5        * wrapup/Makefile.am: Disable dosfs for UNIX.
     6
    172001-03-01      Joel Sherrill <joel@OARcorp.com>
    28
  • c/src/exec/libfs/src/dosfs/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
     6
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../../../automake/compile.am
     9include $(top_srcdir)/../../../automake/lib.am
    610
    711INCLUDES = -I.
    8 
    9 LIBNAME = libdosfs
    10 LIB = ${ARCH}/${LIBNAME}.a
     12AM_CFLAGS += $(LIBC_DEFINES)
    1113
    1214FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
     
    1719                msdos_misc.c msdos_mknod.c msdos_node_type.c
    1820
     21if !UNIX
     22LIBNAME = libdosfs
     23LIB = ${ARCH}/${LIBNAME}.a
    1924
    20 UNIX_C_FILES = msdos_unixstub.c
     25C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    2126
    22 EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    23 
    24 COMMON_C_FILES =
    25 
    26 if UNIX
    27 C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
    28 else
    29 C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
    30 endif
    3127C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    3228
    3329include_HEADERS = fat.h fat_fat_operations.h \
    3430                  fat_file.h msdos.h dosfs.h
    35 SYS_H_FILES =
    36 RTEMS_H_FILES =
    37 noinst_HEADERS =
    3831
    39 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    40 include $(top_srcdir)/../../../automake/compile.am
    41 include $(top_srcdir)/../../../automake/lib.am
    42 
    43 PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
    44     $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
    45     $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
    46     $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
     32H_FILES = $(PROJECT_INCLUDE) \
     33    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    4734
    4835$(PROJECT_INCLUDE):
    4936        @$(mkinstalldirs) $@
    50 $(PROJECT_INCLUDE)/rtems:
    51         @$(mkinstalldirs) $@
    52 $(PROJECT_INCLUDE)/sys:
    53         @$(mkinstalldirs) $@
    5437
    5538$(PROJECT_INCLUDE)/%.h: %.h
    56         $(INSTALL_DATA) $< $@
    57 $(PROJECT_INCLUDE)/rtems/%.h: %.h
    58         $(INSTALL_DATA) $< $@
    59 $(PROJECT_INCLUDE)/sys/%.h: %.h
    6039        $(INSTALL_DATA) $< $@
    6140
     
    6544# Add local stuff here using +=
    6645#
    67 
    68 AM_CFLAGS += $(LIBC_DEFINES)
    69 
    7046all-local: ${ARCH} $(LIB)
    7147
    7248$(LIB): ${OBJS}
    7349        $(make-library)
     50endif
    7451
    75 DOC_FILES =
     52TMPINSTALL_FILES += $(H_FILES)
    7653
    77 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
    78     $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
     54EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
    7955
    8056include $(top_srcdir)/../../../automake/local.am
  • c/src/exec/libfs/wrapup/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77LIBNAME = libfs
     
    1414IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
    1515
     16if !UNIX
    1617DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
     18endif
    1719
    1820TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)
  • c/src/libfs/ChangeLog

    rac97074f r2de2bec  
     12002-03-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        Reported and tracked as PR130.
     4        * src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
     5        * wrapup/Makefile.am: Disable dosfs for UNIX.
     6
    172001-03-01      Joel Sherrill <joel@OARcorp.com>
    28
  • c/src/libfs/src/dosfs/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
     6
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../../../automake/compile.am
     9include $(top_srcdir)/../../../automake/lib.am
    610
    711INCLUDES = -I.
    8 
    9 LIBNAME = libdosfs
    10 LIB = ${ARCH}/${LIBNAME}.a
     12AM_CFLAGS += $(LIBC_DEFINES)
    1113
    1214FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
     
    1719                msdos_misc.c msdos_mknod.c msdos_node_type.c
    1820
     21if !UNIX
     22LIBNAME = libdosfs
     23LIB = ${ARCH}/${LIBNAME}.a
    1924
    20 UNIX_C_FILES = msdos_unixstub.c
     25C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    2126
    22 EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    23 
    24 COMMON_C_FILES =
    25 
    26 if UNIX
    27 C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
    28 else
    29 C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
    30 endif
    3127C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    3228
    3329include_HEADERS = fat.h fat_fat_operations.h \
    3430                  fat_file.h msdos.h dosfs.h
    35 SYS_H_FILES =
    36 RTEMS_H_FILES =
    37 noinst_HEADERS =
    3831
    39 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    40 include $(top_srcdir)/../../../automake/compile.am
    41 include $(top_srcdir)/../../../automake/lib.am
    42 
    43 PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
    44     $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
    45     $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
    46     $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
     32H_FILES = $(PROJECT_INCLUDE) \
     33    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    4734
    4835$(PROJECT_INCLUDE):
    4936        @$(mkinstalldirs) $@
    50 $(PROJECT_INCLUDE)/rtems:
    51         @$(mkinstalldirs) $@
    52 $(PROJECT_INCLUDE)/sys:
    53         @$(mkinstalldirs) $@
    5437
    5538$(PROJECT_INCLUDE)/%.h: %.h
    56         $(INSTALL_DATA) $< $@
    57 $(PROJECT_INCLUDE)/rtems/%.h: %.h
    58         $(INSTALL_DATA) $< $@
    59 $(PROJECT_INCLUDE)/sys/%.h: %.h
    6039        $(INSTALL_DATA) $< $@
    6140
     
    6544# Add local stuff here using +=
    6645#
    67 
    68 AM_CFLAGS += $(LIBC_DEFINES)
    69 
    7046all-local: ${ARCH} $(LIB)
    7147
    7248$(LIB): ${OBJS}
    7349        $(make-library)
     50endif
    7451
    75 DOC_FILES =
     52TMPINSTALL_FILES += $(H_FILES)
    7653
    77 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
    78     $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
     54EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
    7955
    8056include $(top_srcdir)/../../../automake/local.am
  • c/src/libfs/wrapup/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77LIBNAME = libfs
     
    1414IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
    1515
     16if !UNIX
    1617DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
     18endif
    1719
    1820TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)
  • cpukit/libfs/ChangeLog

    rac97074f r2de2bec  
     12002-03-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        Reported and tracked as PR130.
     4        * src/dosfs/Makefile.am: Reworked, Disable dosfs for UNIX.
     5        * wrapup/Makefile.am: Disable dosfs for UNIX.
     6
    172001-03-01      Joel Sherrill <joel@OARcorp.com>
    28
  • cpukit/libfs/src/dosfs/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
     6
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../../../automake/compile.am
     9include $(top_srcdir)/../../../automake/lib.am
    610
    711INCLUDES = -I.
    8 
    9 LIBNAME = libdosfs
    10 LIB = ${ARCH}/${LIBNAME}.a
     12AM_CFLAGS += $(LIBC_DEFINES)
    1113
    1214FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
     
    1719                msdos_misc.c msdos_mknod.c msdos_node_type.c
    1820
     21if !UNIX
     22LIBNAME = libdosfs
     23LIB = ${ARCH}/${LIBNAME}.a
    1924
    20 UNIX_C_FILES = msdos_unixstub.c
     25C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    2126
    22 EMBEDDED_C_FILES = $(FATFS_C_FILES) $(DOSFS_C_FILES)
    23 
    24 COMMON_C_FILES =
    25 
    26 if UNIX
    27 C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
    28 else
    29 C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
    30 endif
    3127C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    3228
    3329include_HEADERS = fat.h fat_fat_operations.h \
    3430                  fat_file.h msdos.h dosfs.h
    35 SYS_H_FILES =
    36 RTEMS_H_FILES =
    37 noinst_HEADERS =
    3831
    39 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    40 include $(top_srcdir)/../../../automake/compile.am
    41 include $(top_srcdir)/../../../automake/lib.am
    42 
    43 PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \
    44     $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
    45     $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
    46     $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
     32H_FILES = $(PROJECT_INCLUDE) \
     33    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
    4734
    4835$(PROJECT_INCLUDE):
    4936        @$(mkinstalldirs) $@
    50 $(PROJECT_INCLUDE)/rtems:
    51         @$(mkinstalldirs) $@
    52 $(PROJECT_INCLUDE)/sys:
    53         @$(mkinstalldirs) $@
    5437
    5538$(PROJECT_INCLUDE)/%.h: %.h
    56         $(INSTALL_DATA) $< $@
    57 $(PROJECT_INCLUDE)/rtems/%.h: %.h
    58         $(INSTALL_DATA) $< $@
    59 $(PROJECT_INCLUDE)/sys/%.h: %.h
    6039        $(INSTALL_DATA) $< $@
    6140
     
    6544# Add local stuff here using +=
    6645#
    67 
    68 AM_CFLAGS += $(LIBC_DEFINES)
    69 
    7046all-local: ${ARCH} $(LIB)
    7147
    7248$(LIB): ${OBJS}
    7349        $(make-library)
     50endif
    7451
    75 DOC_FILES =
     52TMPINSTALL_FILES += $(H_FILES)
    7653
    77 EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
    78     $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
     54EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
    7955
    8056include $(top_srcdir)/../../../automake/local.am
  • cpukit/libfs/wrapup/Makefile.am

    rac97074f r2de2bec  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77LIBNAME = libfs
     
    1414IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
    1515
     16if !UNIX
    1617DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
     18endif
    1719
    1820TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)
Note: See TracChangeset for help on using the changeset viewer.