From f93676ededd8eec44d8ed60991b03c4948c4aa51 Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Fri, 22 Dec 2023 22:45:56 -0800
Subject: [PATCH] Tweak

---
 tools/configure.py | 57 +++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/tools/configure.py b/tools/configure.py
index e7980d5..999dbf4 100755
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -97,9 +97,14 @@ rule mkdir
 rule importation
   description = importation
   depfile = $out.dd
-  command = ../tools/importation.py -i $in -o $out -I . -I .. $options --depsout $out.dd -DVERSION=$version -DREVSION=$revision
+  command = ../tools/importation.py -i $in -o $out -I . -I .. $options --depsout $depfile -DVERSION=$version -DREVSION=$revision
 
 build gen: mkdir
+build posix: mkdir
+build windows: mkdir
+build esp32: mkdir
+build esp32/ESP32forth: mkdir
+build esp32/ESP32forth/optional: mkdir
 
 """ % {
   'version': VERSION,
@@ -109,41 +114,51 @@ build gen: mkdir
   'libs': ' '.join(LIBS),
 }
 
-def Importation(target, source, header_mode='cpp', name=None, keep=False):
-  source = '../' + source
+def Importation(target, source, header_mode='cpp', name=None, keep=False, deps=None):
   options = ''
   if keep:
     options += '--keep-first-comment'
   if name:
     options += ' --name ' + name + ' --header ' + header_mode
+  outdir = os.path.dirname(target)
   global output
-  output += f"""
-build {target}: importation {source} | gen
-  options = {options}
-"""
+  output += f'build {target}: importation {source} | {outdir}\n'
+  if options:
+    output += f'  options = {options}\n'
+  if deps:
+    output += f'  depfile = {deps}\n'
 
 def Esp32Optional(target, c_source, header, name, forth_source):
   Importation(target, name, forth_source)
   Importation('gen/' + header, name, forth_source)
 
-Importation('gen/esp32_assembler.h', 'common/assembler.fs', name='assembler_source')
+Importation('gen/esp32_assembler.h', '../common/assembler.fs', name='assembler_source')
 Importation('gen/esp32_xtensa-assembler.h',
-            'esp32/optional/assemblers/xtensa-assembler.fs', name='xtensa_assembler_source')
+            '../esp32/optional/assemblers/xtensa-assembler.fs', name='xtensa_assembler_source')
 Importation('gen/esp32_riscv-assembler.h',
-            'esp32/optional/assemblers/riscv-assembler.fs', name='riscv_assembler_source')
+            '../esp32/optional/assemblers/riscv-assembler.fs', name='riscv_assembler_source')
 
-Importation('gen/esp32_camera.h', 'esp32/optional/camera/camera_server.fs', name='camera_source')
-Importation('gen/esp32_interrupts.h', 'esp32/optional/interrupts/timers.fs', name='interrupts_source')
-Importation('gen/esp32_oled.h', 'esp32/optional/oled/oled.fs', name='oled_source')
-Importation('gen/esp32_spi-flash.h', 'esp32/optional/spi-flash/spi-flash.fs', name='spi_flash_source')
+Importation('gen/esp32_camera.h',
+            '../esp32/optional/camera/camera_server.fs', name='camera_source')
+Importation('esp32/ESP32forth/optional/camera.h',
+            'gen/esp32_camera.h', deps='gen/esp32_optional_camera.h.dd')
+
+Importation('gen/esp32_interrupts.h',
+            '../esp32/optional/interrupts/timers.fs', name='interrupts_source')
+Importation('gen/esp32_oled.h',
+            '../esp32/optional/oled/oled.fs', name='oled_source')
+Importation('gen/esp32_spi-flash.h',
+            '../esp32/optional/spi-flash/spi-flash.fs',
+            name='spi_flash_source')
 Importation('gen/esp32_serial-bluetooth.h',
-            'esp32/optional/serial-bluetooth/serial-bluetooth.fs', name='serial_bluetooth_source')
+            '../esp32/optional/serial-bluetooth/serial-bluetooth.fs',
+            name='serial_bluetooth_source')
 
-Importation('gen/posix_boot.h', 'posix/posix_boot.fs', name='boot')
-Importation('gen/window_boot.h', 'windows/windows_boot.fs', header_mode='win', name='boot')
-Importation('gen/window_boot_extra.h', 'windows/windows_boot_extra.fs', header_mode='win', name='boot')
-Importation('gen/pico_ice_boot.h', 'pico-ice/pico_ice_boot.fs', name='boot')
-Importation('gen/esp32_boot.h', 'esp32/esp32_boot.fs', name='boot')
-Importation('gen/web_boot.js', 'web/web_boot.fs', header_mode='web', name='boot')
+Importation('gen/posix_boot.h', '../posix/posix_boot.fs', name='boot')
+Importation('gen/window_boot.h', '../windows/windows_boot.fs', header_mode='win', name='boot')
+Importation('gen/window_boot_extra.h', '../windows/windows_boot_extra.fs', header_mode='win', name='boot')
+Importation('gen/pico_ice_boot.h', '../pico-ice/pico_ice_boot.fs', name='boot')
+Importation('gen/esp32_boot.h', '../esp32/esp32_boot.fs', name='boot')
+Importation('gen/web_boot.js', '../web/web_boot.fs', header_mode='web', name='boot')
 
 print(output)