More refactor.

This commit is contained in:
Brad Nelson
2022-01-30 13:33:19 -08:00
parent 7bff8e55f0
commit a3c1446528
2 changed files with 7 additions and 9 deletions

View File

@ -162,14 +162,14 @@ COMMON_PREPLATFORM = common/boot.fs common/conditionals.fs common/vocabulary.fs
COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs
COMMON_POSTPLATFORM = common/utils.fs common/locals.fs \ COMMON_POSTPLATFORM = common/utils.fs common/locals.fs \
common/filetools.fs common/highlevel.fs common/filetools.fs common/highlevel.fs \
common/streams.fs common/blocks.fs
POSIX_BOOT = $(COMMON_PREPLATFORM) \ POSIX_BOOT = $(COMMON_PREPLATFORM) \
$(COMMON_DESKTOP) \ $(COMMON_DESKTOP) \
posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \ posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \
common/tasks.fs $(COMMON_POSTPLATFORM) \ common/tasks.fs $(COMMON_POSTPLATFORM) \
common/desktop.fs posix/posix_desktop.fs \ common/desktop.fs posix/posix_desktop.fs \
common/streams.fs common/blocks.fs \
posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \ posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
posix/autoboot.fs \ posix/autoboot.fs \
common/fini.fs common/fini.fs
@ -180,8 +180,6 @@ WINDOWS_BOOT = $(COMMON_PREPLATFORM) \
$(COMMON_DESKTOP) \ $(COMMON_DESKTOP) \
windows/windows.fs windows/windows_highlevel.fs \ windows/windows.fs windows/windows_highlevel.fs \
common/tasks.fs $(COMMON_POSTPLATFORM) common/desktop.fs \ common/tasks.fs $(COMMON_POSTPLATFORM) common/desktop.fs \
common/streams.fs \
common/blocks.fs \
posix/autoboot.fs \ posix/autoboot.fs \
common/fini.fs common/fini.fs
$(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN) $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
@ -191,10 +189,10 @@ ESP32_BOOT = $(COMMON_PREPLATFORM) \
common/tasks.fs esp32/platform.fs esp32/highlevel.fs \ common/tasks.fs esp32/platform.fs esp32/highlevel.fs \
esp32/bindings.fs \ esp32/bindings.fs \
$(COMMON_POSTPLATFORM) \ $(COMMON_POSTPLATFORM) \
common/streams.fs posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \ posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
esp32/registers.fs esp32/timers.fs \ esp32/registers.fs esp32/timers.fs \
esp32/bterm.fs posix/telnetd.fs \ esp32/bterm.fs posix/telnetd.fs \
esp32/camera.fs esp32/camera_server.fs common/blocks.fs \ esp32/camera.fs esp32/camera_server.fs \
esp32/autoboot.fs common/fini.fs esp32/autoboot.fs common/fini.fs
$(GEN)/esp32_boot.h: common/source_to_string.js $(ESP32_BOOT) | $(GEN) $(GEN)/esp32_boot.h: common/source_to_string.js $(ESP32_BOOT) | $(GEN)
$< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@ $< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@

View File

@ -391,9 +391,9 @@ e: test-forth-namespace
e: test-forth-namespace e: test-forth-namespace
' forth list-from ' forth list-from
out: FORTH out: FORTH
check-args
check-blocks check-blocks
out: streams out: streams
check-args
check-highlevel check-highlevel
check-snapshots check-snapshots
check-locals check-locals
@ -450,10 +450,10 @@ e: test-forth-namespace
out: httpd out: httpd
out: telnetd out: telnetd
out: sockets out: sockets
check-blocks
out: streams
out: xlib out: xlib
check-args check-args
check-blocks
out: streams
check-highlevel check-highlevel
check-snapshots check-snapshots
check-locals check-locals