Changeset b45a853 in rtems


Ignore:
Timestamp:
Sep 14, 2018, 4:34:02 AM (15 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
8d677cf
Parents:
d3d1243
git-author:
Sebastian Huber <sebastian.huber@…> (09/14/18 04:34:02)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/10/18 05:52:39)
Message:

build: Merge libfs/Makefile.am

Location:
cpukit
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/Makefile.am

    rd3d1243 rb45a853  
    261261libcpukit_a_SOURCES += libcsupport/src/write_r.c
    262262libcpukit_a_SOURCES += libcsupport/src/writev.c
     263libcpukit_a_SOURCES += libfs/src/defaults/default_are_nodes_equal.c
     264libcpukit_a_SOURCES += libfs/src/defaults/default_chown.c
     265libcpukit_a_SOURCES += libfs/src/defaults/default_clone.c
     266libcpukit_a_SOURCES += libfs/src/defaults/default_close.c
     267libcpukit_a_SOURCES += libfs/src/defaults/default_eval_path.c
     268libcpukit_a_SOURCES += libfs/src/defaults/default_fchmod.c
     269libcpukit_a_SOURCES += libfs/src/defaults/default_fcntl.c
     270libcpukit_a_SOURCES += libfs/src/defaults/default_freenode.c
     271libcpukit_a_SOURCES += libfs/src/defaults/default_fstat.c
     272libcpukit_a_SOURCES += libfs/src/defaults/default_fsunmount.c
     273libcpukit_a_SOURCES += libfs/src/defaults/default_fsync.c
     274libcpukit_a_SOURCES += libfs/src/defaults/default_fsync_success.c
     275libcpukit_a_SOURCES += libfs/src/defaults/default_ftruncate.c
     276libcpukit_a_SOURCES += libfs/src/defaults/default_ftruncate_directory.c
     277libcpukit_a_SOURCES += libfs/src/defaults/default_handlers.c
     278libcpukit_a_SOURCES += libfs/src/defaults/default_ioctl.c
     279libcpukit_a_SOURCES += libfs/src/defaults/default_kqfilter.c
     280libcpukit_a_SOURCES += libfs/src/defaults/default_link.c
     281libcpukit_a_SOURCES += libfs/src/defaults/default_lock_and_unlock.c
     282libcpukit_a_SOURCES += libfs/src/defaults/default_lseek.c
     283libcpukit_a_SOURCES += libfs/src/defaults/default_lseek_directory.c
     284libcpukit_a_SOURCES += libfs/src/defaults/default_lseek_file.c
     285libcpukit_a_SOURCES += libfs/src/defaults/default_mknod.c
     286libcpukit_a_SOURCES += libfs/src/defaults/default_mmap.c
     287libcpukit_a_SOURCES += libfs/src/defaults/default_mount.c
     288libcpukit_a_SOURCES += libfs/src/defaults/default_open.c
     289libcpukit_a_SOURCES += libfs/src/defaults/default_ops.c
     290libcpukit_a_SOURCES += libfs/src/defaults/default_poll.c
     291libcpukit_a_SOURCES += libfs/src/defaults/default_read.c
     292libcpukit_a_SOURCES += libfs/src/defaults/default_readlink.c
     293libcpukit_a_SOURCES += libfs/src/defaults/default_readv.c
     294libcpukit_a_SOURCES += libfs/src/defaults/default_rename.c
     295libcpukit_a_SOURCES += libfs/src/defaults/default_rmnod.c
     296libcpukit_a_SOURCES += libfs/src/defaults/default_statvfs.c
     297libcpukit_a_SOURCES += libfs/src/defaults/default_symlink.c
     298libcpukit_a_SOURCES += libfs/src/defaults/default_unmount.c
     299libcpukit_a_SOURCES += libfs/src/defaults/default_utime.c
     300libcpukit_a_SOURCES += libfs/src/defaults/default_write.c
     301libcpukit_a_SOURCES += libfs/src/defaults/default_writev.c
     302libcpukit_a_SOURCES += libfs/src/devfs/devclose.c
     303libcpukit_a_SOURCES += libfs/src/devfs/devfs_eval.c
     304libcpukit_a_SOURCES += libfs/src/devfs/devfs_init.c
     305libcpukit_a_SOURCES += libfs/src/devfs/devfs_mknod.c
     306libcpukit_a_SOURCES += libfs/src/devfs/devfs_show.c
     307libcpukit_a_SOURCES += libfs/src/devfs/devioctl.c
     308libcpukit_a_SOURCES += libfs/src/devfs/devopen.c
     309libcpukit_a_SOURCES += libfs/src/devfs/devread.c
     310libcpukit_a_SOURCES += libfs/src/devfs/devstat.c
     311libcpukit_a_SOURCES += libfs/src/devfs/devwrite.c
     312libcpukit_a_SOURCES += libfs/src/imfs/deviceio.c
     313libcpukit_a_SOURCES += libfs/src/imfs/imfs_chown.c
     314libcpukit_a_SOURCES += libfs/src/imfs/imfs_config.c
     315libcpukit_a_SOURCES += libfs/src/imfs/imfs_creat.c
     316libcpukit_a_SOURCES += libfs/src/imfs/imfs_dir.c
     317libcpukit_a_SOURCES += libfs/src/imfs/imfs_dir_default.c
     318libcpukit_a_SOURCES += libfs/src/imfs/imfs_dir_minimal.c
     319libcpukit_a_SOURCES += libfs/src/imfs/imfs_eval.c
     320libcpukit_a_SOURCES += libfs/src/imfs/imfs_fchmod.c
     321libcpukit_a_SOURCES += libfs/src/imfs/imfs_fifo.c
     322libcpukit_a_SOURCES += libfs/src/imfs/imfs_fsunmount.c
     323libcpukit_a_SOURCES += libfs/src/imfs/imfs_handlers_device.c
     324libcpukit_a_SOURCES += libfs/src/imfs/imfs_init.c
     325libcpukit_a_SOURCES += libfs/src/imfs/imfs_initsupp.c
     326libcpukit_a_SOURCES += libfs/src/imfs/imfs_linfile.c
     327libcpukit_a_SOURCES += libfs/src/imfs/imfs_link.c
     328libcpukit_a_SOURCES += libfs/src/imfs/imfs_load_tar.c
     329libcpukit_a_SOURCES += libfs/src/imfs/imfs_make_generic_node.c
     330libcpukit_a_SOURCES += libfs/src/imfs/imfs_memfile.c
     331libcpukit_a_SOURCES += libfs/src/imfs/imfs_mknod.c
     332libcpukit_a_SOURCES += libfs/src/imfs/imfs_mount.c
     333libcpukit_a_SOURCES += libfs/src/imfs/imfs_node.c
     334libcpukit_a_SOURCES += libfs/src/imfs/imfs_rename.c
     335libcpukit_a_SOURCES += libfs/src/imfs/imfs_rmnod.c
     336libcpukit_a_SOURCES += libfs/src/imfs/imfs_stat.c
     337libcpukit_a_SOURCES += libfs/src/imfs/imfs_stat_file.c
     338libcpukit_a_SOURCES += libfs/src/imfs/imfs_symlink.c
     339libcpukit_a_SOURCES += libfs/src/imfs/imfs_unmount.c
     340libcpukit_a_SOURCES += libfs/src/imfs/imfs_utime.c
     341libcpukit_a_SOURCES += libfs/src/imfs/ioman.c
     342libcpukit_a_SOURCES += libfs/src/pipe/fifo.c
     343libcpukit_a_SOURCES += libfs/src/pipe/pipe.c
     344libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-bitmaps.c
     345libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-block.c
     346libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-buffer-bdbuf.c
     347libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-buffer.c
     348libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-dir.c
     349libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-dir-hash.c
     350libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-file.c
     351libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-file-system.c
     352libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-format.c
     353libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-group.c
     354libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-inode.c
     355libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-link.c
     356libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-mutex.c
     357libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems.c
     358libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-dev.c
     359libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-dir.c
     360libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-file.c
     361libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-utils.c
     362libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-shell.c
     363libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-trace.c
    263364libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
    264365libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
     
    328429endif
    329430
     431if LIBDOSFS
     432
     433libcpukit_a_SOURCES += libfs/src/dosfs/fat.c
     434libcpukit_a_SOURCES += libfs/src/dosfs/fat_fat_operations.c
     435libcpukit_a_SOURCES += libfs/src/dosfs/fat_file.c
     436libcpukit_a_SOURCES += libfs/src/dosfs/msdos_conv.c
     437libcpukit_a_SOURCES += libfs/src/dosfs/msdos_conv_default.c
     438libcpukit_a_SOURCES += libfs/src/dosfs/msdos_conv_utf8.c
     439libcpukit_a_SOURCES += libfs/src/dosfs/msdos_create.c
     440libcpukit_a_SOURCES += libfs/src/dosfs/msdos_dir.c
     441libcpukit_a_SOURCES += libfs/src/dosfs/msdos_eval.c
     442libcpukit_a_SOURCES += libfs/src/dosfs/msdos_file.c
     443libcpukit_a_SOURCES += libfs/src/dosfs/msdos_format.c
     444libcpukit_a_SOURCES += libfs/src/dosfs/msdos_free.c
     445libcpukit_a_SOURCES += libfs/src/dosfs/msdos_fsunmount.c
     446libcpukit_a_SOURCES += libfs/src/dosfs/msdos_handlers_dir.c
     447libcpukit_a_SOURCES += libfs/src/dosfs/msdos_handlers_file.c
     448libcpukit_a_SOURCES += libfs/src/dosfs/msdos_init.c
     449libcpukit_a_SOURCES += libfs/src/dosfs/msdos_initsupp.c
     450libcpukit_a_SOURCES += libfs/src/dosfs/msdos_misc.c
     451libcpukit_a_SOURCES += libfs/src/dosfs/msdos_mknod.c
     452libcpukit_a_SOURCES += libfs/src/dosfs/msdos_rename.c
     453libcpukit_a_SOURCES += libfs/src/dosfs/msdos_rmnod.c
     454libcpukit_a_SOURCES += libfs/src/dosfs/msdos_statvfs.c
     455
     456endif
     457
    330458if LIBDRVMGR
    331459
     
    386514# librtemscpu
    387515_SUBDIRS = . score rtems posix
    388 _SUBDIRS += libfs
    389516_SUBDIRS += libnetworking librpc
    390517_SUBDIRS += libpci
     
    432559endif
    433560
     561project_lib_LIBRARIES += libjffs2.a
     562
     563$(PROJECT_LIB)/libjffs2.a: libjffs2.a
     564        $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
     565TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
     566
     567libjffs2_a_SOURCES =
     568libjffs2_a_SOURCES += libfs/src/jffs2/src/build.c
     569libjffs2_a_SOURCES += libfs/src/jffs2/src/compat-crc32.c
     570libjffs2_a_SOURCES += libfs/src/jffs2/src/compr.c
     571libjffs2_a_SOURCES += libfs/src/jffs2/src/compr_rtime.c
     572libjffs2_a_SOURCES += libfs/src/jffs2/src/compr_zlib.c
     573libjffs2_a_SOURCES += libfs/src/jffs2/src/debug.c
     574libjffs2_a_SOURCES += libfs/src/jffs2/src/dir-rtems.c
     575libjffs2_a_SOURCES += libfs/src/jffs2/src/erase.c
     576libjffs2_a_SOURCES += libfs/src/jffs2/src/flashio.c
     577libjffs2_a_SOURCES += libfs/src/jffs2/src/fs-rtems.c
     578libjffs2_a_SOURCES += libfs/src/jffs2/src/gc.c
     579libjffs2_a_SOURCES += libfs/src/jffs2/src/malloc-rtems.c
     580libjffs2_a_SOURCES += libfs/src/jffs2/src/nodelist.c
     581libjffs2_a_SOURCES += libfs/src/jffs2/src/nodemgmt.c
     582libjffs2_a_SOURCES += libfs/src/jffs2/src/read.c
     583libjffs2_a_SOURCES += libfs/src/jffs2/src/readinode.c
     584libjffs2_a_SOURCES += libfs/src/jffs2/src/scan.c
     585libjffs2_a_SOURCES += libfs/src/jffs2/src/write.c
     586libjffs2_a_CFLAGS =
     587libjffs2_a_CFLAGS += -Wno-pointer-sign
     588libjffs2_a_CPPFLAGS =
     589libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS)
     590libjffs2_a_CPPFLAGS += -I$(srcdir)/libfs/src/jffs2/include
     591
     592if LIBNETWORKING
     593
     594project_lib_LIBRARIES += libnfs.a
     595
     596$(PROJECT_LIB)/libnfs.a: libnfs.a
     597        $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
     598TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a
     599
     600libnfs_a_SOURCES =
     601libnfs_a_SOURCES += libfs/src/nfsclient/proto/mount_prot_xdr.c
     602libnfs_a_SOURCES += libfs/src/nfsclient/proto/nfs_prot_xdr.c
     603libnfs_a_SOURCES += libfs/src/nfsclient/src/nfs.c
     604libnfs_a_SOURCES += libfs/src/nfsclient/src/rpcio.c
     605libnfs_a_SOURCES += libfs/src/nfsclient/src/sock_mbuf.c
     606libnfs_a_SOURCES += libfs/src/nfsclient/src/xdr_mbuf.c
     607
     608endif
     609
    434610include $(top_srcdir)/automake/subdirs.am
    435611include $(top_srcdir)/automake/local.am
  • cpukit/configure.ac

    rd3d1243 rb45a853  
    498498score/cpu/no_cpu/Makefile
    499499posix/Makefile
    500 libfs/Makefile
    501 libfs/src/nfsclient/Makefile
    502500libgnat/Makefile
    503501libnetworking/Makefile
  • cpukit/wrapup/Makefile.am

    rd3d1243 rb45a853  
    2525
    2626TMP_LIBS += ../libstdthreads/libstdthreads.a
    27 if LIBDOSFS
    28 TMP_LIBS += ../libfs/libdosfs.a
    29 endif
    30 TMP_LIBS += ../libfs/libdefaultfs.a
    31 TMP_LIBS += ../libfs/libdevfs.a
    32 TMP_LIBS += ../libfs/libimfs.a
    33 TMP_LIBS += ../libfs/librfs.a
    3427
    3528TMP_LIBS += ../libmisc/libmonitor.a
Note: See TracChangeset for help on using the changeset viewer.