Changeset 3e828ea in mainline for uspace/srv/meson.build


Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/meson.build

    r9259d20 r3e828ea  
    11#
    2 # Copyright (c) 2006 Martin Decky
     2# Copyright (c) 2019 Jiří Zárevúcky
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 .PHONY: all build_dist clean
    30 
    31 include Makefile.common
    32 
    33 SILO_PACKAGE = a.out
    34 
    35 ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b
    36 SECOND_B = silo/$(SILO_PACKAGE)/second.b
    37 SILO_CONF = silo/silo.conf
    38 ISOFS_B_IN = $(DISTROOT)/boot/isofs.b
    39 
    40 all: $(POST_OUTPUT)
    41 
    42 $(POST_OUTPUT): build_dist
    43         $(GENISOIMAGE) -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
    44 
    45 build_dist: clean
    46         mkdir -p $(DISTROOT)/boot
    47         mkdir -p $(DISTROOT)/HelenOS
    48         cp $(BOOT_OUTPUT) $(DISTROOT)/HelenOS/
    49         cp $(ISOFS_B) $(DISTROOT)/boot/
    50         cp $(SECOND_B) $(DISTROOT)/boot/
    51         cp $(SILO_CONF) $(DISTROOT)/boot/
    52 
    53 clean:
    54         rm -fr $(DISTROOT)
     29srvs = [
     30        'audio/hound',
     31        'bd/file_bd',
     32        'bd/rd',
     33        'bd/sata_bd',
     34        'bd/vbd',
     35        'clipboard',
     36        'devman',
     37        'fs/cdfs',
     38        'fs/exfat',
     39        'fs/ext4fs',
     40        'fs/fat',
     41        'fs/locfs',
     42        'fs/mfs',
     43        'fs/tmpfs',
     44        'fs/udf',
     45        'hid/compositor',
     46        'hid/console',
     47        'hid/input',
     48        'hid/isdv4_tablet',
     49        'hid/output',
     50        'hid/remcons',
     51        'hid/rfb',
     52        'hid/s3c24xx_ts',
     53        'hw/char/s3c24xx_uart',
     54        'klog',
     55        'loader',
     56        'locsrv',
     57        'logger',
     58        'net/dhcp',
     59        'net/dnsrsrv',
     60        'net/ethip',
     61        'net/inetsrv',
     62        'net/loopip',
     63        'net/nconfsrv',
     64        'net/slip',
     65        'net/tcp',
     66        'net/udp',
     67        'ns',
     68        'taskmon',
     69        'test/chardev-test',
     70        'test/ipc-test',
     71        'vfs',
     72        'volsrv',
     73]
Note: See TracChangeset for help on using the changeset viewer.