Changeset e503cea9 in mainline


Ignore:
Timestamp:
2019-08-17T12:49:43Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
92fff0c
Parents:
1783f75
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-29 14:30:56)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

use meson target for doxygen

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • Makefile

    r1783f75 re503cea9  
    6666endif
    6767
    68 .PHONY: all precheck cscope cscope_parts config_default config distclean clean check releasefile release meson export-posix space
     68.PHONY: all precheck cscope cscope_parts config_default config distclean clean check releasefile release meson space
    6969
    7070all: meson
    … …  
    110110        tools/srepl '[ \t]\+$$' ''
    111111
    112 doxy:
    113         $(MAKE) -r -C doxygen
     112doxy: $(BUILD_DIR)/build.ninja
     113        ninja -C $(BUILD_DIR) doxygen
    114114
    115115# Pre-integration build check

  • doxygen/meson.build

    r1783f75 re503cea9  
    2727#
    2828
    29 cfg_file = doxygen.cfg
    30 gen_cfg = doxygen.cfg.gen
    31 patch_file = doxygen.cfg.diff
    32 output_dirs = latex html
     29doxygen = find_program('doxygen')
     30patch = find_program('patch')
     31patch_file = files('doxygen.cfg.diff')
    3332
    34 all: doxygen.cfg
    35         doxygen $^
    3633
    37 clean:
    38         rm -f $(gen_cfg) $(cfg_file)
    39         rm -rf $(output_dirs)
     34gen_cfg = custom_target('doxygen.cfg.gen',
     35        output: 'doxygen.cfg.gen',
     36        command: [ doxygen, '-g', '@OUTPUT@' ],
     37)
    4038
    41 $(cfg_file): $(gen_cfg)
    42         cp $^ $@
    43         patch $@ $(patch_file)
     39dox_cfg = custom_target('doxygen.cfg',
     40        output: 'doxygen.cfg',
     41        input: [ gen_cfg, patch_file ],
     42        command: [ patch, '-o', '@OUTPUT@', '@INPUT@' ],
     43)
    4444
    45 $(gen_cfg):
    46         doxygen -g $@
     45run_target('doxygen', command: [ doxygen, dox_cfg ])

  • meson.build

    r1783f75 re503cea9  
    1111    meson_version: '>=0.50.1',
    1212)
     13
     14subdir('doxygen')
    1315
    1416cc = meson.get_compiler('c')
Note: See TracChangeset for help on using the changeset viewer.