Allowed to compile the project from a fresh install by fixing mistakes.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@521 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

6 files changed, 329 insertions, 291 deletions

diff --git a/ChangeLog b/ChangeLog
index 17dce96..d7f8dc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+115-04-27  Cyrille Bagard <nocbos@gmail.com>
+
+	* configure.ac:
+	* po/POTFILES.in:
+	* src/arch/arm/v7/build_tmp_decl.sh:
+	* src/arch/arm/v7/opcodes/Makefile.am:
+	* tools/d2c/d2c_genmakefile.sh:
+	Allow to compile the project from a fresh install by fixing mistakes.
+
 115-04-26  Cyrille Bagard <nocbos@gmail.com>
 
 	* src/analysis/disass/output.c:
diff --git a/configure.ac b/configure.ac
index 42f802a..ef05fde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,8 @@ AC_PREREQ(2.59)
 AC_INIT([chrysalide], [0.3.78], [nocbos@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e575fe7..3c97379 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,360 +1,378 @@
-src/analysis/binaries/file.c
-src/analysis/binary.c
-src/analysis/block.c
-src/analysis/blocks/flow.c
-src/analysis/blocks/raccess.c
-src/analysis/blocks/virtual.c
-src/analysis/db/cdb.c
-src/analysis/db/client.c
-src/analysis/db/collection.c
-src/analysis/db/core.c
-src/analysis/db/item.c
-src/analysis/db/items/bookmark.c
-src/analysis/db/items/comment.c
-src/analysis/db/misc/rlestr.c
-src/analysis/db/server.c
-src/analysis/decomp/cmerge.c
-src/analysis/decomp/decompiler.c
-src/analysis/decomp/il.c
-src/analysis/decomp/reduce.c
-src/analysis/disass/disassembler.c
-src/analysis/disass/fetch.c
-src/analysis/disass/limit.c
-src/analysis/disass/links.c
-src/analysis/disass/loop.c
-src/analysis/disass/macro.c
-src/analysis/disass/output.c
-src/analysis/disass/rank.c
-src/analysis/roptions.c
-src/analysis/routine.c
-src/analysis/type.c
-src/analysis/types/basic.c
-src/analysis/types/cse.c
-src/analysis/types/encaps.c
-src/analysis/types/literal.c
-src/analysis/types/template.c
-src/analysis/variable.c
-src/arch/archbase.c
-src/arch/arm/context.c
-src/arch/arm/instruction.c
-src/arch/arm/processor.c
-src/arch/arm/register.c
-src/arch/arm/v456/addressing.c
-src/arch/arm/v456/instruction.c
-src/arch/arm/v456/operands/content.c
-src/arch/arm/v456/operands/register.c
-src/arch/arm/v456/register.c
-src/arch/arm/v7/arm.c
-src/arch/arm/v7/helpers.c
-src/arch/arm/v7/instruction.c
-src/arch/arm/v7/processor.c
-src/arch/arm/v7/register.c
-src/arch/artificial.c
+src/plugins/context.c
+src/plugins/pglist.c
+src/plugins/plugin.c
+src/plugins/overjump/overjump.c
+src/common/net.c
+src/common/xml.c
+src/common/fnv1a.c
+src/common/endianness.c
+src/common/xdg.c
+src/common/io.c
+src/common/leb128.c
+src/common/asm.c
+src/common/sqlite.c
+src/common/dllist.c
+src/common/extstr.c
+src/common/environment.c
+src/arch/processor.c
+src/arch/target.c
+src/arch/operand.c
+src/arch/raw.c
 src/arch/context.c
+src/arch/register.c
+src/arch/archbase.c
+src/arch/dalvik/processor.c
+src/arch/dalvik/operand.c
+src/arch/dalvik/pseudo/switch.c
+src/arch/dalvik/pseudo/fill.c
 src/arch/dalvik/context.c
-src/arch/dalvik/decomp/aget.c
-src/arch/dalvik/decomp/aput.c
-src/arch/dalvik/decomp/arithm.c
-src/arch/dalvik/decomp/array.c
-src/arch/dalvik/decomp/const.c
-src/arch/dalvik/decomp/if.c
-src/arch/dalvik/decomp/iget.c
-src/arch/dalvik/decomp/invoke.c
-src/arch/dalvik/decomp/iput.c
-src/arch/dalvik/decomp/move.c
-src/arch/dalvik/decomp/new.c
-src/arch/dalvik/decomp/ret.c
-src/arch/dalvik/decomp/switch.c
-src/arch/dalvik/instruction.c
-src/arch/dalvik/opcodes/add.c
-src/arch/dalvik/opcodes/aget.c
-src/arch/dalvik/opcodes/and.c
-src/arch/dalvik/opcodes/aput.c
-src/arch/dalvik/opcodes/array.c
+src/arch/dalvik/register.c
+src/arch/dalvik/opcodes/ret.c
 src/arch/dalvik/opcodes/check.c
-src/arch/dalvik/opcodes/cmp.c
-src/arch/dalvik/opcodes/const.c
 src/arch/dalvik/opcodes/div.c
-src/arch/dalvik/opcodes/goto.c
-src/arch/dalvik/opcodes/if.c
-src/arch/dalvik/opcodes/iget.c
-src/arch/dalvik/opcodes/instanceof.c
-src/arch/dalvik/opcodes/invoke.c
+src/arch/dalvik/opcodes/shr.c
+src/arch/dalvik/opcodes/rsub.c
+src/arch/dalvik/opcodes/array.c
+src/arch/dalvik/opcodes/const.c
+src/arch/dalvik/opcodes/switch.c
 src/arch/dalvik/opcodes/iput.c
-src/arch/dalvik/opcodes/monitor.c
-src/arch/dalvik/opcodes/move.c
-src/arch/dalvik/opcodes/mul.c
-src/arch/dalvik/opcodes/neg.c
+src/arch/dalvik/opcodes/sget.c
+src/arch/dalvik/opcodes/or.c
 src/arch/dalvik/opcodes/new.c
+src/arch/dalvik/opcodes/aput.c
+src/arch/dalvik/opcodes/xor.c
+src/arch/dalvik/opcodes/iget.c
 src/arch/dalvik/opcodes/nop.c
-src/arch/dalvik/opcodes/not.c
-src/arch/dalvik/opcodes/or.c
+src/arch/dalvik/opcodes/goto.c
+src/arch/dalvik/opcodes/aget.c
+src/arch/dalvik/opcodes/ushr.c
+src/arch/dalvik/opcodes/cmp.c
+src/arch/dalvik/opcodes/monitor.c
 src/arch/dalvik/opcodes/rem.c
-src/arch/dalvik/opcodes/ret.c
-src/arch/dalvik/opcodes/rsub.c
-src/arch/dalvik/opcodes/sget.c
-src/arch/dalvik/opcodes/shl.c
-src/arch/dalvik/opcodes/shr.c
+src/arch/dalvik/opcodes/to.c
+src/arch/dalvik/opcodes/and.c
+src/arch/dalvik/opcodes/instanceof.c
+src/arch/dalvik/opcodes/if.c
+src/arch/dalvik/opcodes/mul.c
+src/arch/dalvik/opcodes/throw.c
 src/arch/dalvik/opcodes/sput.c
+src/arch/dalvik/opcodes/add.c
+src/arch/dalvik/opcodes/shl.c
+src/arch/dalvik/opcodes/invoke.c
+src/arch/dalvik/opcodes/not.c
+src/arch/dalvik/opcodes/move.c
 src/arch/dalvik/opcodes/sub.c
-src/arch/dalvik/opcodes/switch.c
-src/arch/dalvik/opcodes/throw.c
-src/arch/dalvik/opcodes/to.c
-src/arch/dalvik/opcodes/ushr.c
-src/arch/dalvik/opcodes/xor.c
-src/arch/dalvik/operand.c
-src/arch/dalvik/operands/args.c
-src/arch/dalvik/operands/pool.c
-src/arch/dalvik/operands/register.c
+src/arch/dalvik/opcodes/neg.c
+src/arch/dalvik/decomp/ret.c
+src/arch/dalvik/decomp/array.c
+src/arch/dalvik/decomp/const.c
+src/arch/dalvik/decomp/switch.c
+src/arch/dalvik/decomp/iput.c
+src/arch/dalvik/decomp/new.c
+src/arch/dalvik/decomp/aput.c
+src/arch/dalvik/decomp/iget.c
+src/arch/dalvik/decomp/aget.c
+src/arch/dalvik/decomp/arithm.c
+src/arch/dalvik/decomp/if.c
+src/arch/dalvik/decomp/invoke.c
+src/arch/dalvik/decomp/move.c
+src/arch/dalvik/instruction.c
 src/arch/dalvik/operands/target.c
-src/arch/dalvik/processor.c
-src/arch/dalvik/pseudo/fill.c
-src/arch/dalvik/pseudo/switch.c
-src/arch/dalvik/register.c
+src/arch/dalvik/operands/register.c
+src/arch/dalvik/operands/pool.c
+src/arch/dalvik/operands/args.c
 src/arch/immediate.c
-src/arch/instruction.c
-src/arch/jvm/instruction.c
-src/arch/jvm/op_add.c
+src/arch/arm/processor.c
+src/arch/arm/v7/processor.c
+src/arch/arm/v7/context.c
+src/arch/arm/v7/register.c
+src/arch/arm/v7/thumb_16.c
+src/arch/arm/v7/helpers.c
+src/arch/arm/v7/post.c
+src/arch/arm/v7/fetch.c
+src/arch/arm/v7/pseudo.c
+src/arch/arm/v7/instruction.c
+src/arch/arm/v7/operands/offset.c
+src/arch/arm/v7/operands/rotation.c
+src/arch/arm/v7/operands/reglist.c
+src/arch/arm/v7/operands/maccess.c
+src/arch/arm/v7/operands/shift.c
+src/arch/arm/v7/thumb_32.c
+src/arch/arm/v7/arm.c
+src/arch/arm/context.c
+src/arch/arm/register.c
+src/arch/arm/v456/register.c
+src/arch/arm/v456/addressing.c
+src/arch/arm/v456/instruction.c
+src/arch/arm/v456/operands/register.c
+src/arch/arm/v456/operands/content.c
+src/arch/arm/instruction.c
+src/arch/arm/link.c
+src/arch/jvm/processor.c
 src/arch/jvm/op_const.c
-src/arch/jvm/op_convert.c
-src/arch/jvm/op_dup.c
+src/arch/jvm/op_add.c
+src/arch/jvm/op_pop.c
 src/arch/jvm/operand.c
+src/arch/jvm/op_monitor.c
+src/arch/jvm/op_store.c
+src/arch/jvm/op_dup.c
 src/arch/jvm/op_getput.c
 src/arch/jvm/op_invoke.c
 src/arch/jvm/op_load.c
-src/arch/jvm/op_monitor.c
+src/arch/jvm/op_convert.c
 src/arch/jvm/op_nop.c
-src/arch/jvm/op_pop.c
+src/arch/jvm/instruction.c
 src/arch/jvm/op_ret.c
-src/arch/jvm/op_store.c
-src/arch/jvm/processor.c
-src/arch/mips/instruction.c
+src/arch/artificial.c
+src/arch/instruction.c
+src/arch/mips/processor.c
 src/arch/mips/op_add.c
-src/arch/mips/op_and.c
-src/arch/mips/op_branch.c
 src/arch/mips/operand.c
-src/arch/mips/op_jump.c
-src/arch/mips/op_load.c
-src/arch/mips/op_nop.c
-src/arch/mips/op_sr.c
 src/arch/mips/op_store.c
 src/arch/mips/op_sub.c
-src/arch/mips/processor.c
+src/arch/mips/op_sr.c
+src/arch/mips/op_branch.c
+src/arch/mips/op_load.c
+src/arch/mips/op_nop.c
+src/arch/mips/instruction.c
 src/arch/mips/registers.c
-src/arch/operand.c
-src/arch/processor.c
-src/arch/raw.c
-src/arch/register.c
-src/arch/vmpa.c
-src/arch/x86/instruction.c
-src/arch/x86/opcodes/adc.c
-src/arch/x86/opcodes/add.c
-src/arch/x86/opcodes/and.c
-src/arch/x86/opcodes/arpl.c
-src/arch/x86/opcodes/call.c
+src/arch/mips/op_jump.c
+src/arch/mips/op_and.c
+src/arch/link.c
+src/arch/x86/processor.c
+src/arch/x86/operand.c
+src/arch/x86/register.c
+src/arch/x86/opcodes/ret.c
+src/arch/x86/opcodes/shr.c
 src/arch/x86/opcodes/cld.c
-src/arch/x86/opcodes/cmp.c
-src/arch/x86/opcodes/cmps.c
-src/arch/x86/opcodes/dec.c
-src/arch/x86/opcodes/hlt.c
-src/arch/x86/opcodes/inc.c
-src/arch/x86/opcodes/int.c
-src/arch/x86/opcodes/jump.c
-src/arch/x86/opcodes/lea.c
-src/arch/x86/opcodes/leave.c
-src/arch/x86/opcodes/mov.c
-src/arch/x86/opcodes/movs.c
+src/arch/x86/opcodes/set.c
 src/arch/x86/opcodes/movsx.c
+src/arch/x86/opcodes/stos.c
 src/arch/x86/opcodes/movzx.c
-src/arch/x86/opcodes/mul.c
-src/arch/x86/opcodes/nop.c
-src/arch/x86/opcodes/not.c
-src/arch/x86/opcodes/or.c
+src/arch/x86/opcodes/rcr.c
 src/arch/x86/opcodes/pop.c
 src/arch/x86/opcodes/push.c
+src/arch/x86/opcodes/int.c
+src/arch/x86/opcodes/lea.c
+src/arch/x86/opcodes/dec.c
+src/arch/x86/opcodes/or.c
 src/arch/x86/opcodes/rcl.c
-src/arch/x86/opcodes/rcr.c
-src/arch/x86/opcodes/ret.c
-src/arch/x86/opcodes/rol.c
+src/arch/x86/opcodes/sbb.c
+src/arch/x86/opcodes/cmps.c
+src/arch/x86/opcodes/xor.c
+src/arch/x86/opcodes/test.c
+src/arch/x86/opcodes/nop.c
+src/arch/x86/opcodes/jump.c
 src/arch/x86/opcodes/ror.c
 src/arch/x86/opcodes/sar.c
-src/arch/x86/opcodes/sbb.c
+src/arch/x86/opcodes/mov.c
+src/arch/x86/opcodes/hlt.c
+src/arch/x86/opcodes/cmp.c
+src/arch/x86/opcodes/and.c
+src/arch/x86/opcodes/adc.c
 src/arch/x86/opcodes/scas.c
-src/arch/x86/opcodes/set.c
+src/arch/x86/opcodes/mul.c
+src/arch/x86/opcodes/arpl.c
+src/arch/x86/opcodes/rol.c
+src/arch/x86/opcodes/call.c
+src/arch/x86/opcodes/movs.c
+src/arch/x86/opcodes/add.c
+src/arch/x86/opcodes/leave.c
 src/arch/x86/opcodes/shl.c
-src/arch/x86/opcodes/shr.c
-src/arch/x86/opcodes/stos.c
-src/arch/x86/opcodes/sub.c
-src/arch/x86/opcodes/test.c
+src/arch/x86/opcodes/not.c
+src/arch/x86/opcodes/inc.c
 src/arch/x86/opcodes/xchg.c
-src/arch/x86/opcodes/xor.c
-src/arch/x86/operand.c
-src/arch/x86/operands/data.c
-src/arch/x86/operands/modrm.c
-src/arch/x86/operands/moffs.c
+src/arch/x86/opcodes/sub.c
+src/arch/x86/instruction.c
 src/arch/x86/operands/register.c
 src/arch/x86/operands/relative.c
-src/arch/x86/processor.c
-src/arch/x86/register.c
-src/common/asm.c
-src/common/dllist.c
-src/common/endianness.c
-src/common/environment.c
-src/common/extstr.c
-src/common/fnv1a.c
-src/common/io.c
-src/common/leb128.c
-src/common/net.c
-src/common/xdg.c
-src/common/xml.c
-src/core/collections.c
-src/core/core.c
-src/core/params.c
+src/arch/x86/operands/moffs.c
+src/arch/x86/operands/modrm.c
+src/arch/x86/operands/data.c
+src/arch/vmpa.c
+src/gui/tb/tbitem.c
+src/gui/tb/source.c
+src/gui/tb/portions.c
+src/gui/panels/regedit.c
+src/gui/panels/panel.c
+src/gui/panels/symbols.c
+src/gui/panels/glance.c
+src/gui/panels/welcome.c
+src/gui/panels/strings.c
+src/gui/panels/log.c
+src/gui/panels/bookmarks.c
+src/gui/status.c
+src/gui/editem.c
+src/gui/menus/binary.c
+src/gui/menus/debug.c
+src/gui/menus/help.c
+src/gui/menus/edition.c
+src/gui/menus/view.c
+src/gui/menus/menubar.c
+src/gui/menus/file.c
+src/gui/menus/project.c
+src/glibext/gbuffersegment.c
+src/glibext/signal.c
+src/glibext/gbinportion.c
+src/glibext/gcodebuffer.c
+src/glibext/delayed.c
+src/glibext/gbincontent.c
+src/glibext/gbufferline.c
+src/glibext/gnhash.c
+src/glibext/configuration.c
+src/panels/breaks.c
+src/panels/panel.c
+src/panels/strings.c
+src/panels/registers.c
 src/debug/break.c
-src/debug/debugger.c
+src/debug/packet.c
+src/debug/remgdb/packet.c
+src/debug/remgdb/helpers.c
+src/debug/remgdb/tcp.c
+src/debug/remgdb/stream.c
+src/debug/remgdb/gdb.c
+src/debug/jdwp/packet.c
+src/debug/jdwp/sets/thread.c
+src/debug/jdwp/sets/vm.c
+src/debug/jdwp/sets/list.c
+src/debug/jdwp/tcp.c
 src/debug/jdwp/debugger.c
 src/debug/jdwp/misc/header.c
 src/debug/jdwp/misc/id.c
 src/debug/jdwp/misc/location.c
 src/debug/jdwp/misc/types.c
-src/debug/jdwp/packet.c
-src/debug/jdwp/sets/list.c
-src/debug/jdwp/sets/thread.c
-src/debug/jdwp/sets/vm.c
-src/debug/jdwp/tcp.c
-src/debug/packet.c
-src/debug/remgdb/gdb.c
-src/debug/remgdb/helpers.c
-src/debug/remgdb/packet.c
-src/debug/remgdb/stream.c
-src/debug/remgdb/tcp.c
 src/debug/stream.c
+src/debug/debugger.c
+src/decomp/instr/keyword.c
+src/decomp/instr/switch.c
+src/decomp/instr/ite.c
 src/decomp/context.c
-src/decomp/expr/access.c
-src/decomp/expr/arithm.c
+src/decomp/expression.c
+src/decomp/output.c
+src/decomp/instruction.c
+src/decomp/lang/java.c
+src/decomp/lang/asm.c
 src/decomp/expr/array.c
-src/decomp/expr/assign.c
-src/decomp/expr/block.c
-src/decomp/expr/call.c
-src/decomp/expr/comp.c
-src/decomp/expr/cond.c
 src/decomp/expr/dalvik/array.c
-src/decomp/expression.c
+src/decomp/expr/access.c
 src/decomp/expr/immediate.c
+src/decomp/expr/cond.c
+src/decomp/expr/assign.c
 src/decomp/expr/pseudo.c
-src/decomp/expr/return.c
+src/decomp/expr/arithm.c
+src/decomp/expr/block.c
+src/decomp/expr/call.c
 src/decomp/expr/text.c
-src/decomp/instr/ite.c
-src/decomp/instr/keyword.c
-src/decomp/instr/switch.c
-src/decomp/instruction.c
-src/decomp/lang/asm.c
-src/decomp/lang/java.c
-src/decomp/output.c
-src/dialogs/about.c
-src/dialogs/binparts.c
-src/dialogs/export.c
-src/dialogs/goto.c
-src/dialogs/plugins.c
-src/dialogs/shellcode.c
-src/dialogs/storage.c
-src/dlg_sections.c
-src/editor.c
+src/decomp/expr/return.c
+src/decomp/expr/comp.c
+src/format/dwarf/abbrev.c
+src/format/dwarf/dwarf.c
+src/format/dwarf/utils.c
+src/format/dwarf/info.c
+src/format/dwarf/d_dwarf.c
+src/format/mangling/context.c
+src/format/mangling/demangler.c
+src/format/mangling/itanium/abi.c
+src/format/mangling/itanium/context.c
+src/format/mangling/itanium/component.c
+src/format/executable.c
 src/format/dbg_format.c
-src/format/dex/class.c
+src/format/pe/pe.c
+src/format/pe/symbols.c
+src/format/pe/section.c
+src/format/pe/pe-int.c
+src/format/symbol.c
+src/format/dex/method.c
 src/format/dex/dex.c
 src/format/dex/dex-int.c
-src/format/dex/method.c
 src/format/dex/pool.c
-src/format/dwarf/abbrev.c
-src/format/dwarf/d_dwarf.c
-src/format/dwarf/dwarf.c
-src/format/dwarf/info.c
-src/format/dwarf/utils.c
+src/format/dex/class.c
+src/format/elf/program.c
+src/format/elf/helper_mips.c
+src/format/elf/symbols.c
 src/format/elf/elf.c
+src/format/elf/helper_arm.c
 src/format/elf/elf-int.c
-src/format/elf/helper_mips.c
-src/format/elf/helper_x86.c
-src/format/elf/program.c
 src/format/elf/section.c
+src/format/elf/dynamic.c
 src/format/elf/strings.c
-src/format/elf/symbols.c
-src/format/executable.c
-src/format/exe_format.c
+src/format/elf/helper_x86.c
 src/format/format.c
 src/format/java/attribute.c
-src/format/java/e_java.c
 src/format/java/field.c
-src/format/java/java.c
-src/format/java/java-int.c
 src/format/java/method.c
+src/format/java/java.c
+src/format/java/e_java.c
 src/format/java/pool.c
-src/format/mangling/context.c
-src/format/mangling/demangler.c
-src/format/mangling/itanium/abi.c
-src/format/mangling/itanium/component.c
-src/format/mangling/itanium/context.c
-src/format/part.c
-src/format/pe/pe.c
-src/format/pe/pe-int.c
-src/format/pe/section.c
-src/format/pe/symbols.c
-src/format/symbol.c
-src/glibext/configuration.c
-src/glibext/delayed.c
-src/glibext/gbinportion.c
-src/glibext/gbufferline.c
-src/glibext/gbuffersegment.c
-src/glibext/gcodebuffer.c
-src/glibext/gnhash.c
-src/glibext/signal.c
+src/format/java/java-int.c
+src/analysis/binary.c
+src/analysis/disass/rank.c
+src/analysis/disass/output.c
+src/analysis/disass/area.c
+src/analysis/disass/macro.c
+src/analysis/disass/loop.c
+src/analysis/disass/fetch.c
+src/analysis/disass/limit.c
+src/analysis/disass/links.c
+src/analysis/disass/disassembler.c
+src/analysis/blocks/virtual.c
+src/analysis/blocks/raccess.c
+src/analysis/blocks/flow.c
+src/analysis/decomp/decompiler.c
+src/analysis/decomp/il.c
+src/analysis/decomp/cmerge.c
+src/analysis/decomp/reduce.c
+src/analysis/type.c
+src/analysis/db/collection.c
+src/analysis/db/cdb.c
+src/analysis/db/items/comment.c
+src/analysis/db/items/bookmark.c
+src/analysis/db/misc/rlestr.c
+src/analysis/db/client.c
+src/analysis/db/core.c
+src/analysis/db/item.c
+src/analysis/db/server.c
+src/analysis/roptions.c
+src/analysis/block.c
+src/analysis/routine.c
+src/analysis/variable.c
+src/analysis/binaries/file.c
+src/analysis/types/encaps.c
+src/analysis/types/cse.c
+src/analysis/types/literal.c
+src/analysis/types/template.c
+src/analysis/types/basic.c
+src/dialogs/about.c
+src/dialogs/export.c
+src/dialogs/storage.c
+src/dialogs/goto.c
+src/dialogs/gotox.c
+src/dialogs/shellcode.c
+src/dialogs/bookmark.c
+src/dialogs/plugins.c
+src/gtkext/gtkdockstation.c
+src/gtkext/gtklinkrenderer.c
+src/gtkext/theme.c
 src/gtkext/easygtk.c
-src/gtkext/graph/dot.c
-src/gtkext/graph/edge.c
-src/gtkext/graph/layout.c
-src/gtkext/graph/node.c
-src/gtkext/graph/nodes/flow.c
-src/gtkext/graph/nodes/virtual.c
-src/gtkext/graph/ranks.c
+src/gtkext/gtksourceview.c
 src/gtkext/gtkbinarystrip.c
 src/gtkext/gtkblockview.c
 src/gtkext/gtkbufferview.c
-src/gtkext/gtkdockstation.c
 src/gtkext/gtkextstatusbar.c
-src/gtkext/gtkgraphview.c
-src/gtkext/gtklinkrenderer.c
-src/gtkext/gtksourceview.c
-src/gtkext/gtkviewpanel.c
 src/gtkext/support.c
-src/gtkext/theme.c
-src/gui/editem.c
-src/gui/menus/binary.c
-src/gui/menus/debug.c
-src/gui/menus/edition.c
-src/gui/menus/file.c
-src/gui/menus/help.c
-src/gui/menus/menubar.c
-src/gui/menus/project.c
-src/gui/menus/view.c
-src/gui/panels/bookmarks.c
-src/gui/panels/glance.c
-src/gui/panels/log.c
-src/gui/panels/panel.c
-src/gui/panels/regedit.c
-src/gui/panels/strings.c
-src/gui/panels/symbols.c
-src/gui/panels/welcome.c
-src/gui/status.c
-src/gui/tb/portions.c
-src/gui/tb/source.c
-src/gui/tb/tbitem.c
+src/gtkext/gtkviewpanel.c
+src/gtkext/gtkgraphview.c
+src/gtkext/graph/nodes/virtual.c
+src/gtkext/graph/nodes/flow.c
+src/gtkext/graph/ranks.c
+src/gtkext/graph/layout.c
+src/gtkext/graph/edge.c
+src/gtkext/graph/node.c
 src/main.c
-src/panels/breaks.c
-src/panels/panel.c
-src/panels/registers.c
-src/panels/strings.c
-src/plugins/context.c
-src/plugins/overjump/overjump.c
-src/plugins/pglist.c
-src/plugins/plugin.c
+src/core/formats.c
+src/core/params.c
+src/core/processors.c
+src/core/collections.c
+src/core/core.c
 src/project.c
+src/editor.c
diff --git a/src/arch/arm/v7/build_tmp_decl.sh b/src/arch/arm/v7/build_tmp_decl.sh
index 1833f1b..0b4c2bc 100755
--- a/src/arch/arm/v7/build_tmp_decl.sh
+++ b/src/arch/arm/v7/build_tmp_decl.sh
@@ -16,7 +16,7 @@ for n in $needed; do
 
 	echo "  $n..."
 
-	grep -q "$n(" $header
+	test -f $header && grep -q "$n(" $header
 	if [ $? -ne 0 ]; then
 
 		echo "#define $n(r) NULL" >> $headertmp
diff --git a/src/arch/arm/v7/opcodes/Makefile.am b/src/arch/arm/v7/opcodes/Makefile.am
index fd67ff3..a7313b1 100644
--- a/src/arch/arm/v7/opcodes/Makefile.am
+++ b/src/arch/arm/v7/opcodes/Makefile.am
@@ -1,4 +1,12 @@
 
+# Initialement, ce Makefile est conçu sans définition de am__depfiles_maybe.
+# Est-ce parce que GENERATED_FILES est vide et qu'il n'y a donc pas de code
+# source ? En tout cas, au premier écrasement de gencode.mk, tous les fichiers
+# sont regénérés, et am__depfiles_maybe apparaît enfin. Mais trop tard :
+# des fichiers .Plo sont attendus mais non créés par l'ancien Makefile.
+# On force les choses ici.
+am__depfiles_maybe = depfiles
+
 include gencode.mk
 
 noinst_LTLIBRARIES = libarcharmv7opcodes.la
diff --git a/tools/d2c/d2c_genmakefile.sh b/tools/d2c/d2c_genmakefile.sh
index bd5c379..8d3c6b5 100755
--- a/tools/d2c/d2c_genmakefile.sh
+++ b/tools/d2c/d2c_genmakefile.sh
@@ -113,7 +113,8 @@ do
         $echo >> ${MAKEFILE_TMP}
 
         $echo -n "${arch}_${op}.c: " >> ${MAKEFILE_TMP}
-        $echo "\$(${op}_${arch}_FILES)" | tr [a-z] [A-Z] >> ${MAKEFILE_TMP}
+        $echo -n "\$(${op}_${arch}_FILES)" | tr [a-z] [A-Z] >> ${MAKEFILE_TMP}
+        $echo " ${arch}_opcodes.h" >> ${MAKEFILE_TMP}
 
         $echo -e "\t\$(cini_verbose)cat ${input}/${arch}_.${op}.tmpl.c > \$@" >> ${MAKEFILE_TMP}
         $echo -e "\t\$(cgen_verbose)cat \$^ >> \$@" >> ${MAKEFILE_TMP}