Index: uspace/srv/audio/hound/Makefile =================================================================== --- uspace/srv/audio/hound/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,49 +1,0 @@ -# -# Copyright (c) 2012 Jan Vesely -# 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 = ../../.. -BINARY = hound - -EXTRA_CFLAGS = -DNAME="\"hound\"" - -LIBS = drv hound pcm - -SOURCES = \ - audio_data.c \ - audio_device.c \ - audio_sink.c \ - audio_source.c \ - connection.c \ - hound.c \ - hound_ctx.c \ - iface.c \ - main.c - - -include $(USPACE_PREFIX)/Makefile.common - Index: uspace/srv/audio/hound/meson.build =================================================================== --- uspace/srv/audio/hound/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/audio/hound/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,13 @@ +deps = [ 'drv', 'hound', 'pcm' ] +c_args += '-DNAME="hound"' +src = files( + 'audio_data.c', + 'audio_device.c', + 'audio_sink.c', + 'audio_source.c', + 'connection.c', + 'hound.c', + 'hound_ctx.c', + 'iface.c', + 'main.c', +) Index: uspace/srv/bd/file_bd/Makefile =================================================================== --- uspace/srv/bd/file_bd/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +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 = ../../.. -BINARY = file_bd - -SOURCES = \ - file_bd.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/bd/file_bd/meson.build =================================================================== --- uspace/srv/bd/file_bd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/bd/file_bd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('file_bd.c') Index: uspace/srv/bd/rd/Makefile =================================================================== --- uspace/srv/bd/rd/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,37 +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 = ../../.. -BINARY = rd -STATIC_NEEDED = y - -SOURCES = \ - rd.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/bd/rd/meson.build =================================================================== --- uspace/srv/bd/rd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/bd/rd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('rd.c') Index: uspace/srv/bd/sata_bd/Makefile =================================================================== --- uspace/srv/bd/sata_bd/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2012 Petr Jerman -# 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 = ../../.. -BINARY = sata_bd -LIBS = drv - -SOURCES = \ - sata_bd.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/bd/sata_bd/meson.build =================================================================== --- uspace/srv/bd/sata_bd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/bd/sata_bd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'drv' ] +src = files('sata_bd.c') Index: uspace/srv/bd/vbd/Makefile =================================================================== --- uspace/srv/bd/vbd/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,39 +1,0 @@ -# -# Copyright (c) 2015 Jiri Svoboda -# 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 = label block - -BINARY = vbd - -SOURCES = \ - disk.c \ - vbd.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/bd/vbd/meson.build =================================================================== --- uspace/srv/bd/vbd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/bd/vbd/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'label', 'block' ] +src = files('disk.c', 'vbd.c') Index: uspace/srv/clipboard/Makefile =================================================================== --- uspace/srv/clipboard/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +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 = ../.. -BINARY = clipboard - -SOURCES = \ - clipboard.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/clipboard/meson.build =================================================================== --- uspace/srv/clipboard/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/clipboard/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('clipboard.c') Index: uspace/srv/devman/Makefile =================================================================== --- uspace/srv/devman/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,46 +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 = ../.. -BINARY = devman -STATIC_NEEDED = y - -SOURCES = \ - client_conn.c \ - dev.c \ - devtree.c \ - drv_conn.c \ - driver.c \ - loc.c \ - fun.c \ - main.c \ - match.c \ - util.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/devman/meson.build =================================================================== --- uspace/srv/devman/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/devman/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,12 @@ +src = files( + 'client_conn.c', + 'dev.c', + 'devtree.c', + 'drv_conn.c', + 'driver.c', + 'loc.c', + 'fun.c', + 'main.c', + 'match.c', + 'util.c', +) Index: uspace/srv/fs/cdfs/Makefile =================================================================== --- uspace/srv/fs/cdfs/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/cdfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/exfat/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/ext4fs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/fat/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/locfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/mfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/tmpfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/fs/udf/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -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', +) Index: uspace/srv/hid/compositor/Makefile =================================================================== --- uspace/srv/hid/compositor/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2012 Petr Koupy -# 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 = draw softrend drv compress math - -BINARY = compositor - -SOURCES = \ - compositor.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/compositor/meson.build =================================================================== --- uspace/srv/hid/compositor/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/compositor/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'draw', 'softrend', 'drv', 'compress', 'math' ] +src = files('compositor.c') Index: uspace/srv/hid/console/Makefile =================================================================== --- uspace/srv/hid/console/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +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 = ../../.. -BINARY = console - -SOURCES = \ - console.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/console/meson.build =================================================================== --- uspace/srv/hid/console/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/console/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('console.c') Index: uspace/srv/hid/input/Makefile =================================================================== --- uspace/srv/hid/input/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,49 +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 = ../../.. -BINARY = input -LIBS = drv - -SOURCES = \ - layout/cz.c \ - layout/us_qwerty.c \ - layout/us_dvorak.c \ - layout/ar.c \ - port/chardev.c \ - proto/mousedev.c \ - ctl/kbdev.c \ - ctl/stty.c \ - ctl/sun.c \ - gsp.c \ - input.c \ - layout.c \ - stroke.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/input/meson.build =================================================================== --- uspace/srv/hid/input/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/input/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,16 @@ +deps = [ 'drv' ] +src = files( + 'layout/cz.c', + 'layout/us_qwerty.c', + 'layout/us_dvorak.c', + 'layout/ar.c', + 'port/chardev.c', + 'proto/mousedev.c', + 'ctl/kbdev.c', + 'ctl/stty.c', + 'ctl/sun.c', + 'gsp.c', + 'input.c', + 'layout.c', + 'stroke.c', +) Index: uspace/srv/hid/isdv4_tablet/Makefile =================================================================== --- uspace/srv/hid/isdv4_tablet/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2012 Martin Sucha -# 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 = drv -BINARY = isdv4_tablet - -SOURCES = \ - main.c \ - isdv4.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/isdv4_tablet/meson.build =================================================================== --- uspace/srv/hid/isdv4_tablet/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/isdv4_tablet/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'drv' ] +src = files('main.c', 'isdv4.c') Index: uspace/srv/hid/output/Makefile =================================================================== --- uspace/srv/hid/output/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,41 +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 = ../../.. -BINARY = output -LIBS = drv - -SOURCES = \ - ctl/serial.c \ - port/ega.c \ - port/chardev.c \ - proto/vt100.c \ - output.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/output/meson.build =================================================================== --- uspace/srv/hid/output/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/output/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,8 @@ +deps = [ 'drv' ] +src = files( + 'ctl/serial.c', + 'port/ega.c', + 'port/chardev.c', + 'proto/vt100.c', + 'output.c', +) Index: uspace/srv/hid/remcons/Makefile =================================================================== --- uspace/srv/hid/remcons/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2012 Vojtech Horky -# 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 = ../../.. -BINARY = remcons - -SOURCES = \ - remcons.c \ - user.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/remcons/meson.build =================================================================== --- uspace/srv/hid/remcons/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/remcons/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('remcons.c', 'user.c') Index: uspace/srv/hid/rfb/Makefile =================================================================== --- uspace/srv/hid/rfb/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2013 Martin Sucha -# 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 = graph -BINARY = rfb - -SOURCES = \ - main.c \ - rfb.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/rfb/meson.build =================================================================== --- uspace/srv/hid/rfb/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/rfb/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'graph' ] +src = files('main.c', 'rfb.c') Index: uspace/srv/hid/s3c24xx_ts/Makefile =================================================================== --- uspace/srv/hid/s3c24xx_ts/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2010 Jiri Svoboda -# 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 = ../../.. - -BINARY = s3c24xx_ts - -SOURCES = \ - s3c24xx_ts.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/s3c24xx_ts/meson.build =================================================================== --- uspace/srv/hid/s3c24xx_ts/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hid/s3c24xx_ts/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('s3c24xx_ts.c') Index: uspace/srv/hw/char/s3c24xx_uart/Makefile =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,37 +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 = ../../../.. - -BINARY = s3c24xx_uart - -SOURCES = \ - s3c24xx_uart.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hw/char/s3c24xx_uart/meson.build =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/hw/char/s3c24xx_uart/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('s3c24xx_uart.c') Index: uspace/srv/klog/Makefile =================================================================== --- uspace/srv/klog/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +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 = ../.. -BINARY = klog - -SOURCES = \ - klog.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/klog/meson.build =================================================================== --- uspace/srv/klog/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/klog/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('klog.c') Index: uspace/srv/loader/Makefile =================================================================== --- uspace/srv/loader/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,57 +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 = ../.. -ROOT_PATH = $(USPACE_PREFIX)/.. -CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config - -include $(CONFIG_MAKEFILE) - -ifeq ($(UARCH),ia64) - # IA64 has a peculiar linker script with a fixed data segment address. - # Because the loader is a separate nonrelocatable binary in the same - # address space as the application, we provide a modified copy of - # the default linker script to work around that. - EXTRA_LDFLAGS = -T elf64_ia64_loader.x -else - # On all other architectures, we can simply move the text segment. - EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000 -endif - -BINARY = loader -STATIC_NEEDED = y - -GENERIC_SOURCES = \ - main.c - -SOURCES = \ - $(GENERIC_SOURCES) \ - $(ARCH_SOURCES) - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/loader/meson.build =================================================================== --- uspace/srv/loader/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/loader/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,8 @@ + +if h_arch == 'ia64' + link_args += [ '-T', meson.current_source_dir() / 'elf64_ia64_loader.x' ] +else + link_args += '-Wl,--Ttext-segment=0x70000000' +endif + +src = files('main.c') Index: uspace/srv/locsrv/Makefile =================================================================== --- uspace/srv/locsrv/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (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 = ../.. -BINARY = locsrv -STATIC_NEEDED = y - -SOURCES = \ - category.c \ - locsrv.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/locsrv/meson.build =================================================================== --- uspace/srv/locsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/locsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('category.c', 'locsrv.c') Index: uspace/srv/logger/Makefile =================================================================== --- uspace/srv/logger/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2012 Vojtech Horky -# 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 = ../.. -BINARY = logger -STATIC_NEEDED = y - -SOURCES = \ - ctl.c \ - initlvl.c \ - level.c \ - logs.c \ - main.c \ - writer.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/logger/meson.build =================================================================== --- uspace/srv/logger/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/logger/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,8 @@ +src = files( + 'ctl.c', + 'initlvl.c', + 'level.c', + 'logs.c', + 'main.c', + 'writer.c', +) Index: uspace/srv/meson.build =================================================================== --- uspace/srv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,45 @@ +srvs = [ + 'audio/hound', + 'bd/file_bd', + 'bd/rd', + 'bd/sata_bd', + 'bd/vbd', + 'clipboard', + 'devman', + 'fs/cdfs', + 'fs/exfat', + 'fs/ext4fs', + 'fs/fat', + 'fs/locfs', + 'fs/mfs', + 'fs/tmpfs', + 'fs/udf', + 'hid/compositor', + 'hid/console', + 'hid/input', + 'hid/isdv4_tablet', + 'hid/output', + 'hid/remcons', + 'hid/rfb', + 'hid/s3c24xx_ts', + 'hw/char/s3c24xx_uart', + 'klog', + 'loader', + 'locsrv', + 'logger', + 'net/dhcp', + 'net/dnsrsrv', + 'net/ethip', + 'net/inetsrv', + 'net/loopip', + 'net/nconfsrv', + 'net/slip', + 'net/tcp', + 'net/udp', + 'ns', + 'taskmon', + 'test/chardev-test', + 'test/ipc-test', + 'vfs', + 'volsrv', +] Index: uspace/srv/net/dhcp/Makefile =================================================================== --- uspace/srv/net/dhcp/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2013 Jiri Svoboda -# 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 = ../../.. -BINARY = dhcp - -SOURCES = \ - dhcp.c \ - main.c \ - transport.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/dhcp/meson.build =================================================================== --- uspace/srv/net/dhcp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/dhcp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,5 @@ +src = files( + 'dhcp.c', + 'main.c', + 'transport.c', +) Index: uspace/srv/net/dnsrsrv/Makefile =================================================================== --- uspace/srv/net/dnsrsrv/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = ../../.. -BINARY = dnsrsrv - -SOURCES = \ - dns_msg.c \ - dnsrsrv.c \ - query.c \ - transport.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/dnsrsrv/meson.build =================================================================== --- uspace/srv/net/dnsrsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/dnsrsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,6 @@ +src = files( + 'dns_msg.c', + 'dnsrsrv.c', + 'query.c', + 'transport.c', +) Index: uspace/srv/net/ethip/Makefile =================================================================== --- uspace/srv/net/ethip/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,40 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = ../../.. -BINARY = ethip -LIBS = drv - -SOURCES = \ - arp.c \ - atrans.c \ - ethip.c \ - ethip_nic.c \ - pdu.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/ethip/meson.build =================================================================== --- uspace/srv/net/ethip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/ethip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,8 @@ +deps = [ 'drv' ] +src = files( + 'arp.c', + 'atrans.c', + 'ethip.c', + 'ethip_nic.c', + 'pdu.c', +) Index: uspace/srv/net/inetsrv/Makefile =================================================================== --- uspace/srv/net/inetsrv/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = ../../.. -BINARY = inetsrv - -SOURCES = \ - addrobj.c \ - icmp.c \ - icmpv6.c \ - inetsrv.c \ - inet_link.c \ - inetcfg.c \ - inetping.c \ - ndp.c \ - ntrans.c \ - pdu.c \ - reass.c \ - sroute.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/inetsrv/meson.build =================================================================== --- uspace/srv/net/inetsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/inetsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,14 @@ +src = files( + 'addrobj.c', + 'icmp.c', + 'icmpv6.c', + 'inetsrv.c', + 'inet_link.c', + 'inetcfg.c', + 'inetping.c', + 'ndp.c', + 'ntrans.c', + 'pdu.c', + 'reass.c', + 'sroute.c', +) Index: uspace/srv/net/loopip/Makefile =================================================================== --- uspace/srv/net/loopip/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = ../../.. -BINARY = loopip - -SOURCES = \ - loopip.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/loopip/meson.build =================================================================== --- uspace/srv/net/loopip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/loopip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('loopip.c') Index: uspace/srv/net/nconfsrv/Makefile =================================================================== --- uspace/srv/net/nconfsrv/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2013 Jiri Svoboda -# 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 = ../../.. -BINARY = nconfsrv - -SOURCES = \ - iplink.c \ - nconfsrv.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/nconfsrv/meson.build =================================================================== --- uspace/srv/net/nconfsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/nconfsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('iplink.c', 'nconfsrv.c') Index: uspace/srv/net/slip/Makefile =================================================================== --- uspace/srv/net/slip/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = ../../.. -BINARY = slip -LIBS = drv -SOURCES = \ - slip.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/slip/meson.build =================================================================== --- uspace/srv/net/slip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/slip/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,2 @@ +deps = [ 'drv' ] +src = files('slip.c') Index: uspace/srv/net/tcp/Makefile =================================================================== --- uspace/srv/net/tcp/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,65 +1,0 @@ -# -# Copyright (c) 2011 Jiri Svoboda -# 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 = nettl - -BINARY = tcp - -SOURCES_COMMON = \ - conn.c \ - inet.c \ - iqueue.c \ - ncsim.c \ - pdu.c \ - rqueue.c \ - segment.c \ - seq_no.c \ - test.c \ - tqueue.c \ - ucall.c - -SOURCES = \ - $(SOURCES_COMMON) \ - service.c \ - tcp.c - -TEST_SOURCES = \ - $(SOURCES_COMMON) \ - test/conn.c \ - test/iqueue.c \ - test/main.c \ - test/pdu.c \ - test/rqueue.c \ - test/segment.c \ - test/seq_no.c \ - test/tqueue.c \ - test/ucall.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/tcp/meson.build =================================================================== --- uspace/srv/net/tcp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/tcp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,35 @@ +deps = [ 'nettl' ] + +_common_src = files( + 'conn.c', + 'inet.c', + 'iqueue.c', + 'ncsim.c', + 'pdu.c', + 'rqueue.c', + 'segment.c', + 'seq_no.c', + 'test.c', + 'tqueue.c', + 'ucall.c', +) + +src = files( + 'service.c', + 'tcp.c', +) + +test_src = files( + 'test/conn.c', + 'test/iqueue.c', + 'test/main.c', + 'test/pdu.c', + 'test/rqueue.c', + 'test/segment.c', + 'test/seq_no.c', + 'test/tqueue.c', + 'test/ucall.c', +) + +src = [ _common_src, src ] +test_src = [ _common_src, test_src ] Index: uspace/srv/net/udp/Makefile =================================================================== --- uspace/srv/net/udp/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2012 Jiri Svoboda -# 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 = nettl - -BINARY = udp - -SOURCES = \ - assoc.c \ - msg.c \ - pdu.c \ - service.c \ - udp.c \ - udp_inet.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/udp/meson.build =================================================================== --- uspace/srv/net/udp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/net/udp/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,9 @@ +deps = [ 'nettl' ] +src = files( + 'assoc.c', + 'msg.c', + 'pdu.c', + 'service.c', + 'udp.c', + 'udp_inet.c', +) Index: uspace/srv/ns/Makefile =================================================================== --- uspace/srv/ns/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,40 +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 = ../.. -BINARY = ns -STATIC_NEEDED = y - -SOURCES = \ - ns.c \ - service.c \ - clonable.c \ - task.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/ns/meson.build =================================================================== --- uspace/srv/ns/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/ns/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,6 @@ +src = files( + 'ns.c', + 'service.c', + 'clonable.c', + 'task.c', +) Index: uspace/srv/taskmon/Makefile =================================================================== --- uspace/srv/taskmon/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2010 Jiri Svoboda -# 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 = ../.. -BINARY = taskmon - -SOURCES = \ - taskmon.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/taskmon/meson.build =================================================================== --- uspace/srv/taskmon/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/taskmon/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('taskmon.c') Index: uspace/srv/test/chardev-test/Makefile =================================================================== --- uspace/srv/test/chardev-test/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2017 Jiri Svoboda -# 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 = ../../.. -BINARY = chardev-test - -SOURCES = \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/test/chardev-test/meson.build =================================================================== --- uspace/srv/test/chardev-test/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/test/chardev-test/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('main.c') Index: uspace/srv/test/ipc-test/Makefile =================================================================== --- uspace/srv/test/ipc-test/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,35 +1,0 @@ -# -# Copyright (c) 2018 Jiri Svoboda -# 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 = ../../.. -BINARY = ipc-test - -SOURCES = \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/test/ipc-test/meson.build =================================================================== --- uspace/srv/test/ipc-test/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/test/ipc-test/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,1 @@ +src = files('main.c') Index: uspace/srv/vfs/Makefile =================================================================== --- uspace/srv/vfs/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,44 +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 = ../.. -BINARY = vfs -STATIC_NEEDED = y - -SOURCES = \ - vfs.c \ - vfs_node.c \ - vfs_file.c \ - vfs_ops.c \ - vfs_lookup.c \ - vfs_register.c \ - vfs_ipc.c \ - vfs_pager.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/vfs/meson.build =================================================================== --- uspace/srv/vfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/vfs/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,10 @@ +src = files( + 'vfs.c', + 'vfs_node.c', + 'vfs_file.c', + 'vfs_ops.c', + 'vfs_lookup.c', + 'vfs_register.c', + 'vfs_ipc.c', + 'vfs_pager.c', +) Index: uspace/srv/volsrv/Makefile =================================================================== --- uspace/srv/volsrv/Makefile (revision 2bb6d04c39fdead86dcc9f17ac7800bc278b47fd) +++ (revision ) @@ -1,47 +1,0 @@ -# -# Copyright (c) 2015 Jiri Svoboda -# 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 label sif - -BINARY = volsrv - -SOURCES = \ - empty.c \ - mkfs.c \ - part.c \ - volsrv.c \ - volume.c - -TEST_SOURCES = \ - volume.c \ - test/main.c \ - test/volume.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/volsrv/meson.build =================================================================== --- uspace/srv/volsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) +++ uspace/srv/volsrv/meson.build (revision e428becb1f92b5b4d8d6b10b19091c39ea1b79f9) @@ -0,0 +1,15 @@ +deps = [ 'block', 'label', 'sif' ] + +src = files( + 'empty.c', + 'mkfs.c', + 'part.c', + 'volsrv.c', + 'volume.c', +) + +test_src = files( + 'volume.c', + 'test/main.c', + 'test/volume.c', +)