[PULL,005/150] meson: rename included C source files to .c.inc

With Makefiles that have automatically generated dependencies, you
generated includes are set as dependencies of the Makefile, so that they
are built before everything else and they are available when first
building the .c files.

Alternatively you can use a fine-grained dependency, e.g.

        target/arm/translate.o: target/arm/decode-neon-shared.inc.c

With Meson you have only one choice and it is a third option, namely
"build at the beginning of the corresponding target"; the way you
express it is to list the includes in the sources of that target.

The problem is that Meson decides if something is a source vs. a
generated include by looking at the extension: '.c', '.cc', '.m', '.C'
are sources, while everything else is considered an include---including
'.inc.c'.

Use '.c.inc' to avoid this, as it is consistent with our other convention
of using '.rst.inc' for included reStructuredText files.  The editorconfig
file is adjusted.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .editorconfig                                 |  3 +-
 .gitignore                                    |  4 +-
 Makefile                                      | 36 ++++++++---------
 ...tomic_common.inc.c => atomic_common.c.inc} |  0
 accel/tcg/cputlb.c                            |  2 +-
 accel/tcg/user-exec.c                         |  2 +-
 contrib/gitdm/filetypes.txt                   |  2 +-
 exec.c                                        |  4 +-
 ...alize.inc.c => softfloat-specialize.c.inc} |  0
 fpu/softfloat.c                               |  2 +-
 include/tcg/tcg.h                             |  2 +-
 memory_ldst.inc.c => memory_ldst.c.inc        |  0
 scripts/clean-includes                        |  2 +-
 target/arm/Makefile.objs                      | 40 +++++++++----------
 ...nslate-neon.inc.c => translate-neon.c.inc} |  6 +--
 target/arm/translate-sve.c                    |  2 +-
 ...ranslate-vfp.inc.c => translate-vfp.c.inc} |  4 +-
 target/arm/translate.c                        | 12 +++---
 target/avr/Makefile.objs                      |  4 +-
 target/avr/disas.c                            |  2 +-
 target/avr/translate.c                        |  2 +-
 target/cris/translate.c                       |  2 +-
 ...ranslate_v10.inc.c => translate_v10.c.inc} |  0
 target/hppa/Makefile.objs                     |  4 +-
 target/hppa/translate.c                       |  2 +-
 target/mips/translate.c                       |  2 +-
 ...nslate_init.inc.c => translate_init.c.inc} |  0
 target/openrisc/Makefile.objs                 |  6 +--
 target/openrisc/disas.c                       |  2 +-
 target/openrisc/translate.c                   |  2 +-
 target/ppc/int_helper.c                       |  2 +-
 .../{mfrom_table.inc.c => mfrom_table.c.inc}  |  0
 target/ppc/translate.c                        | 22 +++++-----
 .../{dfp-impl.inc.c => dfp-impl.c.inc}        |  0
 .../{dfp-ops.inc.c => dfp-ops.c.inc}          |  0
 .../{fp-impl.inc.c => fp-impl.c.inc}          |  0
 .../translate/{fp-ops.inc.c => fp-ops.c.inc}  |  0
 .../{spe-impl.inc.c => spe-impl.c.inc}        |  0
 .../{spe-ops.inc.c => spe-ops.c.inc}          |  0
 .../{vmx-impl.inc.c => vmx-impl.c.inc}        |  0
 .../{vmx-ops.inc.c => vmx-ops.c.inc}          |  0
 .../{vsx-impl.inc.c => vsx-impl.c.inc}        |  0
 .../{vsx-ops.inc.c => vsx-ops.c.inc}          |  0
 ...nslate_init.inc.c => translate_init.c.inc} |  0
 target/riscv/Makefile.objs                    |  8 ++--
 ...rivileged.inc.c => trans_privileged.c.inc} |  0
 .../{trans_rva.inc.c => trans_rva.c.inc}      |  0
 .../{trans_rvd.inc.c => trans_rvd.c.inc}      |  0
 .../{trans_rvf.inc.c => trans_rvf.c.inc}      |  0
 .../{trans_rvh.inc.c => trans_rvh.c.inc}      |  0
 .../{trans_rvi.inc.c => trans_rvi.c.inc}      |  0
 .../{trans_rvm.inc.c => trans_rvm.c.inc}      |  0
 .../{trans_rvv.inc.c => trans_rvv.c.inc}      |  0
 target/riscv/translate.c                      | 20 +++++-----
 target/rx/Makefile.objs                       |  6 +--
 target/rx/disas.c                             |  2 +-
 target/rx/translate.c                         |  2 +-
 target/s390x/translate.c                      |  2 +-
 ...{translate_vx.inc.c => translate_vx.c.inc} |  0
 target/xtensa/core-dc232b.c                   |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-dc233c.c                   |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-de212.c                    |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-fsf.c                      |  2 +-
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-sample_controller.c        |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-test_kc705_be.c            |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/core-test_mmuhifi_c3.c          |  4 +-
 .../{gdb-config.inc.c => gdb-config.c.inc}    |  0
 ...nsa-modules.inc.c => xtensa-modules.c.inc} |  0
 target/xtensa/import_core.sh                  |  8 ++--
 tcg/README                                    |  2 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  2 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  2 +-
 tcg/{tcg-ldst.inc.c => tcg-ldst.c.inc}        |  0
 tcg/{tcg-pool.inc.c => tcg-pool.c.inc}        |  2 +-
 tcg/tcg.c                                     |  6 +--
 tcg/tci/README                                |  4 +-
 .../{tcg-target.inc.c => tcg-target.c.inc}    |  0
 tests/fp/fp-test.c                            |  2 +-
 tests/fp/{wrap.inc.c => wrap.c.inc}           |  0
 ui/input-keymap.c                             | 34 ++++++++--------
 ui/vnc-enc-zrle.c                             | 22 +++++-----
 ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.c.inc} |  0
 99 files changed, 175 insertions(+), 174 deletions(-)
 rename accel/tcg/{atomic_common.inc.c => atomic_common.c.inc} (100%)
 rename fpu/{softfloat-specialize.inc.c => softfloat-specialize.c.inc} (100%)
 rename memory_ldst.inc.c => memory_ldst.c.inc (100%)
 rename target/arm/{translate-neon.inc.c => translate-neon.c.inc} (99%)
 rename target/arm/{translate-vfp.inc.c => translate-vfp.c.inc} (99%)
 rename target/cris/{translate_v10.inc.c => translate_v10.c.inc} (100%)
 rename target/mips/{translate_init.inc.c => translate_init.c.inc} (100%)
 rename target/ppc/{mfrom_table.inc.c => mfrom_table.c.inc} (100%)
 rename target/ppc/translate/{dfp-impl.inc.c => dfp-impl.c.inc} (100%)
 rename target/ppc/translate/{dfp-ops.inc.c => dfp-ops.c.inc} (100%)
 rename target/ppc/translate/{fp-impl.inc.c => fp-impl.c.inc} (100%)
 rename target/ppc/translate/{fp-ops.inc.c => fp-ops.c.inc} (100%)
 rename target/ppc/translate/{spe-impl.inc.c => spe-impl.c.inc} (100%)
 rename target/ppc/translate/{spe-ops.inc.c => spe-ops.c.inc} (100%)
 rename target/ppc/translate/{vmx-impl.inc.c => vmx-impl.c.inc} (100%)
 rename target/ppc/translate/{vmx-ops.inc.c => vmx-ops.c.inc} (100%)
 rename target/ppc/translate/{vsx-impl.inc.c => vsx-impl.c.inc} (100%)
 rename target/ppc/translate/{vsx-ops.inc.c => vsx-ops.c.inc} (100%)
 rename target/ppc/{translate_init.inc.c => translate_init.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_privileged.inc.c => trans_privileged.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rva.inc.c => trans_rva.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvd.inc.c => trans_rvd.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvf.inc.c => trans_rvf.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvh.inc.c => trans_rvh.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvi.inc.c => trans_rvi.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvm.inc.c => trans_rvm.c.inc} (100%)
 rename target/riscv/insn_trans/{trans_rvv.inc.c => trans_rvv.c.inc} (100%)
 rename target/s390x/{translate_vx.inc.c => translate_vx.c.inc} (100%)
 rename target/xtensa/core-dc232b/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-dc232b/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-dc233c/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-dc233c/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-de212/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-de212/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-fsf/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-sample_controller/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-sample_controller/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-test_kc705_be/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-test_kc705_be/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename target/xtensa/core-test_mmuhifi_c3/{gdb-config.inc.c => gdb-config.c.inc} (100%)
 rename target/xtensa/core-test_mmuhifi_c3/{xtensa-modules.inc.c => xtensa-modules.c.inc} (100%)
 rename tcg/aarch64/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/arm/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/i386/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/mips/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/ppc/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/riscv/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/s390/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/sparc/{tcg-target.inc.c => tcg-target.c.inc} (99%)
 rename tcg/{tcg-ldst.inc.c => tcg-ldst.c.inc} (100%)
 rename tcg/{tcg-pool.inc.c => tcg-pool.c.inc} (99%)
 rename tcg/tci/{tcg-target.inc.c => tcg-target.c.inc} (100%)
 rename tests/fp/{wrap.inc.c => wrap.c.inc} (100%)
 rename ui/{vnc-enc-zrle.inc.c => vnc-enc-zrle.c.inc} (100%)

Message ID	20200818141025.21608-6-pbonzini@redhat.com
State	Superseded
Headers	show Return-Path: <SRS0=kYy5=B4=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E29BC207FF From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 005/150] meson: rename included C source files to .c.inc Date: Tue, 18 Aug 2020 10:08:00 -0400 Message-Id: <20200818141025.21608-6-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com Precedence: list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	None \| expand [PULL,002/150] optionrom: simplify Makefile [PULL,003/150] pc-bios/s390-ccw: do not use rules.mak [PULL,005/150] meson: rename included C source files to .c.inc [PULL,008/150] tests/vm: do not pollute configure with --efi-aarch64 [PULL,009/150] tests/vm: check for Python YAML parser in the Makefile [PULL,010/150] tests/docker: add test script for static linux-user builds [PULL,011/150] nsis: use "make DESTDIR=" instead of "make prefix=" [PULL,012/150] configure: do not include $(...) variables in config-host.mak [PULL,014/150] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson [PULL,015/150] tests/vm: include setuptools [PULL,016/150] configure: integrate Meson in the build system [PULL,018/150] build-sys hack: link with whole .fa archives [PULL,025/150] libqemuutil, qapi, trace: convert to meson [PULL,031/150] vhost-user-scsi: add compatibility for libiscsi 1.9.0 [PULL,032/150] contrib/vhost-user-scsi: convert to Meson [PULL,033/150] contrib/rdmacm-mux: convert to Meson [PULL,034/150] contrib/vhost-user-input: convert to meson [PULL,035/150] contrib/vhost-user-gpu: convert to meson [PULL,036/150] contrib/ivshmem: convert to meson [PULL,037/150] contrib/elf2dmp: convert to meson [PULL,039/150] meson: add solaris and Haiku libraries [PULL,040/150] meson: convert qemu-ga [PULL,041/150] meson: convert vss-win32 [PULL,042/150] meson: add msi generation [PULL,043/150] meson: convert dummy Windows qga/qemu-ga target [PULL,044/150] meson: add qemu-bridge-helper [PULL,045/150] meson: add qemu-keymap [PULL,047/150] meson: add virtfs-proxy-helper [PULL,049/150] meson: generate qemu-version.h [PULL,051/150] meson: generate hxtool files [PULL,053/150] meson: convert check-decodetree [PULL,057/150] meson: convert authz directory to Meson [PULL,058/150] meson: convert crypto directory to Meson [PULL,059/150] meson: convert io directory to Meson [PULL,061/150] meson: infrastructure for building emulators [PULL,065/150] meson: qemu-{img,io,nbd} [PULL,066/150] meson: qemu-pr-helper [PULL,067/150] configure, Makefile; remove TOOLS and HELPERS-y variable [PULL,068/150] meson: convert chardev directory to Meson (emulator part) [PULL,069/150] meson: convert tests/qtest to meson [PULL,070/150] meson: convert audio directory to Meson [PULL,072/150] meson: convert root directory to Meson [PULL,073/150] meson: convert most of softmmu/ [PULL,074/150] meson: convert trace/ [PULL,076/150] meson: convert common QMP bits for qemu and qemu-storage-daemon [PULL,079/150] meson: convert migration directory to Meson [PULL,080/150] meson: convert net directory to Meson [PULL,081/150] meson: convert backends directory to Meson [PULL,082/150] meson: convert fsdev/ [PULL,083/150] meson: convert disas directory to Meson [PULL,084/150] meson: convert qapi-specific to meson [PULL,087/150] meson: convert hw/semihosting [PULL,088/150] meson: convert hw/nubus [PULL,096/150] meson: convert hw/timer [PULL,098/150] meson: convert hw/ssi [PULL,099/150] meson: convert hw/sd [PULL,101/150] meson: convert hw/pcmcia [PULL,102/150] meson: convert hw/pci-host [PULL,103/150] meson: convert hw/pci-bridge [PULL,105/150] meson: convert hw/nvram [PULL,109/150] meson: convert hw/isa [PULL,111/150] meson: convert hw/ipack [PULL,116/150] meson: convert hw/hyperv [PULL,121/150] meson: convert hw/char [PULL,123/150] meson: convert hw/audio [PULL,125/150] meson: convert hw/acpi [PULL,128/150] meson: target [PULL,129/150] meson: accel [PULL,132/150] meson: cpu-emu [PULL,137/150] remove Makefile.target [PULL,139/150] docs: automatically track manual dependencies [PULL,140/150] meson: build texi doc [PULL,142/150] rules.mak: drop unneeded macros [PULL,143/150] meson: replace create-config with meson configure_file [PULL,147/150] meson: convert po/ [PULL,148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer [PULL,149/150] meson: update build-system documentation [PULL,150/150] docs: convert build system documentation to rST

[PULL,005/150] meson: rename included C source files to .c.inc

Commit Message

Patch