Index: uspace/srv/fs/cdfs/Makefile =================================================================== --- uspace/srv/fs/cdfs/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2010 Jiri Kavalik -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs scsi -BINARY = cdfs - -SOURCES = \ - cdfs.c \ - cdfs_ops.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/cdfs/meson.build =================================================================== --- uspace/srv/fs/cdfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/cdfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,2 @@ +deps = [ 'block', 'fs', 'scsi' ] +src = files('cdfs.c', 'cdfs_ops.c') Index: uspace/srv/fs/exfat/Makefile =================================================================== --- uspace/srv/fs/exfat/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs -BINARY = exfat - -SOURCES = \ - exfat.c \ - exfat_fat.c \ - exfat_bitmap.c \ - exfat_ops.c \ - exfat_idx.c \ - exfat_dentry.c \ - exfat_directory.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/exfat/meson.build =================================================================== --- uspace/srv/fs/exfat/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/exfat/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,10 @@ +deps = [ 'block', 'fs' ] +src = files( + 'exfat.c', + 'exfat_fat.c', + 'exfat_bitmap.c', + 'exfat_ops.c', + 'exfat_idx.c', + 'exfat_dentry.c', + 'exfat_directory.c', +) Index: uspace/srv/fs/ext4fs/Makefile =================================================================== --- uspace/srv/fs/ext4fs/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2012 Frantisek Princ -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = ext4 block fs crypto -BINARY = ext4fs -STATIC_NEEDED = y - -SOURCES = \ - ext4fs.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/ext4fs/meson.build =================================================================== --- uspace/srv/fs/ext4fs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/ext4fs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,2 @@ +deps = [ 'ext4', 'block', 'fs', 'crypto' ] +src = files('ext4fs.c') Index: uspace/srv/fs/fat/Makefile =================================================================== --- uspace/srv/fs/fat/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs -BINARY = fat -STATIC_NEEDED = y - -SOURCES = \ - fat.c \ - fat_ops.c \ - fat_idx.c \ - fat_dentry.c \ - fat_directory.c \ - fat_fat.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/fat/meson.build =================================================================== --- uspace/srv/fs/fat/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/fat/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,9 @@ +deps = [ 'block', 'fs' ] +src = files( + 'fat.c', + 'fat_ops.c', + 'fat_idx.c', + 'fat_dentry.c', + 'fat_directory.c', + 'fat_fat.c', +) Index: uspace/srv/fs/locfs/Makefile =================================================================== --- uspace/srv/fs/locfs/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = fs -BINARY = locfs - -SOURCES = \ - locfs.c \ - locfs_ops.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/locfs/meson.build =================================================================== --- uspace/srv/fs/locfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/locfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,2 @@ +deps = [ 'fs' ] +src = files('locfs.c', 'locfs_ops.c') Index: uspace/srv/fs/mfs/Makefile =================================================================== --- uspace/srv/fs/mfs/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs minix -BINARY = mfs - -SOURCES = \ - mfs.c \ - mfs_ops.c \ - mfs_inode.c \ - mfs_rw.c \ - mfs_dentry.c \ - mfs_balloc.c \ - mfs_utils.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/mfs/meson.build =================================================================== --- uspace/srv/fs/mfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/mfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,10 @@ +deps = [ 'block', 'fs', 'minix' ] +src = files( + 'mfs.c', + 'mfs_ops.c', + 'mfs_inode.c', + 'mfs_rw.c', + 'mfs_dentry.c', + 'mfs_balloc.c', + 'mfs_utils.c', +) Index: uspace/srv/fs/tmpfs/Makefile =================================================================== --- uspace/srv/fs/tmpfs/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,39 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs -BINARY = tmpfs -STATIC_NEEDED = y - -SOURCES = \ - tmpfs.c \ - tmpfs_ops.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/tmpfs/meson.build =================================================================== --- uspace/srv/fs/tmpfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/tmpfs/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,5 @@ +deps = [ 'block', 'fs' ] +src = files( + 'tmpfs.c', + 'tmpfs_ops.c', +) Index: uspace/srv/fs/udf/Makefile =================================================================== --- uspace/srv/fs/udf/Makefile (revision 5e801dccc49faadcb18cd8ddee6200633e8f11b8) +++ (revision ) @@ -1,44 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# Copyright (c) 2012 Julia Medvedeva -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = block fs -BINARY = udf - -SOURCES = \ - udf.c \ - udf_volume.c \ - udf_ops.c \ - udf_osta.c \ - udf_cksum.c \ - udf_file.c \ - udf_idx.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/udf/meson.build =================================================================== --- uspace/srv/fs/udf/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) +++ uspace/srv/fs/udf/meson.build (revision 2fff3c4405a90b5bd3f42603d5368be8b87be9e7) @@ -0,0 +1,10 @@ +deps = [ 'block', 'fs' ] +src = files( + 'udf.c', + 'udf_volume.c', + 'udf_ops.c', + 'udf_osta.c', + 'udf_cksum.c', + 'udf_file.c', + 'udf_idx.c', +)