Changeset 970983e in rtems


Ignore:
Timestamp:
Jan 11, 2004, 7:48:00 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8c31a89f
Parents:
f035132
Message:

2004-01-11 Ralf Corsepius <corsepiu@…>

Location:
cpukit/libfs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/ChangeLog

    rf035132 r970983e  
     12004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Include compile.am, again.
     4        Reformat/Cleanup.
     5
    162004-01-08  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    27
  • cpukit/libfs/Makefile.am

    rf035132 r970983e  
    44
    55include $(top_srcdir)/automake/multilib.am
    6 include $(top_srcdir)/automake/amcompile.am
     6include $(top_srcdir)/automake/compile.am
    77
    88AM_CPPFLAGS += -I$(top_builddir)
    9 AM_CPPFLAGS += $(LIBC_DEFINES)
    109
    1110EXTRA_DIST = README
     
    1312include_HEADERS =
    1413
    15 # imfs
    16 libimfs_EMBEDDED_C_FILES = src/imfs/imfs_chown.c src/imfs/imfs_config.c \
     14EXTRA_LIBRARIES = libimfs.a
     15CLEANFILES = libimfs.a
     16libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_OPTIMIZE_V)
     17
     18EXTRA_LIBRARIES += libimfs_g.a
     19CLEANFILES += libimfs_g.a
     20libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_DEBUG_V)
     21
     22UNUSED_FILES = src/imfs/imfs_load_tar.c
     23
     24libimfs_a_SOURCES =
     25
     26if UNIX
     27libimfs_a_SOURCES += src/imfs/imfs_unixstub.c
     28else
     29libimfs_a_SOURCES += src/imfs/imfs_chown.c src/imfs/imfs_config.c \
    1730    src/imfs/imfs_creat.c src/imfs/imfs_directory.c src/imfs/imfs_eval.c \
    1831    src/imfs/imfs_free.c src/imfs/imfs_fsunmount.c src/imfs/imfs_gtkn.c \
     
    2740    src/imfs/imfs_readlink.c src/imfs/imfs_fdatasync.c src/imfs/imfs_fcntl.c \
    2841    src/imfs/ioman.c src/imfs/miniimfs_init.c
    29 
    30 libimfs_UNUSED_C_FILES = src/imfs/imfs_load_tar.c
    31 
    32 libimfs_UNIX_C_FILES = src/imfs/imfs_unixstub.c
    33 
    34 if UNIX
    35 libimfs_C_FILES = $(libimfs_UNIX_C_FILES)
    36 else
    37 libimfs_C_FILES = $(libimfs_EMBEDDED_C_FILES)
    3842endif
    3943
    40 EXTRA_LIBRARIES = libimfs.a
    41 CLEANFILES = libimfs.a
    42 libimfs_a_SOURCES = $(libimfs_C_FILES)
    43 libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    44 
    45 EXTRA_LIBRARIES += libimfs_g.a
    46 CLEANFILES += libimfs_g.a
    4744libimfs_g_a_SOURCES = $(libimfs_a_SOURCES)
    48 libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    4945
    5046include_HEADERS += src/imfs/imfs.h
     
    5450# dosfs
    5551
    56 libdosfs_FATFS_C_FILES = src/dosfs/fat.c src/dosfs/fat_fat_operations.c \
    57     src/dosfs/fat_file.c src/dosfs/fat.h
     52if !UNIX
     53EXTRA_LIBRARIES += libdosfs.a
     54CLEANFILES += libdosfs.a
     55libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_OPTIMIZE_V)
    5856
    59 libdosfs_DOSFS_C_FILES = src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \
     57EXTRA_LIBRARIES += libdosfs_g.a
     58CLEANFILES += libdosfs_g.a
     59libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIBC_DEFINES) $(CFLAGS_DEBUG_V)
     60
     61# libdosfs_FATFS_C_FILES
     62libdosfs_a_SOURCES = src/dosfs/fat.c src/dosfs/fat.h \
     63    src/dosfs/fat_fat_operations.c src/dosfs/fat_fat_operations.h \
     64    src/dosfs/fat_file.c src/dosfs/fat_file.h
     65
     66# libdosfs_DOSFS_C_FILES
     67libdosfs_a_SOURCES += src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \
    6068    src/dosfs/msdos_eval.c src/dosfs/msdos_file.c src/dosfs/msdos_free.c \
    6169    src/dosfs/msdos_fsunmount.c src/dosfs/msdos_handlers_dir.c \
     
    6371    src/dosfs/msdos_initsupp.c src/dosfs/msdos_misc.c \
    6472    src/dosfs/msdos_mknod.c src/dosfs/msdos_node_type.c \
    65     src/dosfs/msdos_conv.c
     73    src/dosfs/msdos_conv.c src/dosfs/msdos.h
    6674
    67 if !UNIX
    68 libdosfs_C_FILES = $(libdosfs_FATFS_C_FILES) $(libdosfs_DOSFS_C_FILES)
     75libdosfs_g_a_SOURCES = $(libdosfs_a_SOURCES)
    6976
    7077include_HEADERS += src/dosfs/dosfs.h
    7178
    7279DOSFSLIB = libdosfs$(LIB_VARIANT).a
     80endif
    7381
    74 EXTRA_LIBRARIES += libdosfs.a
    75 CLEANFILES += libdosfs.a
    76 libdosfs_a_SOURCES = $(libdosfs_C_FILES)
    77 libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    78 
    79 EXTRA_LIBRARIES += libdosfs_g.a
    80 CLEANFILES += libdosfs_g.a
    81 libdosfs_g_a_SOURCES = $(libdosfs_a_SOURCES)
    82 libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    83 endif
     82EXTRA_DIST += $(UNUSED_FILES)
    8483
    8584all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB)
Note: See TracChangeset for help on using the changeset viewer.