From df2ed4b0863725c48d4c2c07532b0cfa943f7a42 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 1 Mar 2020 00:55:15 +0900 Subject: [PATCH] [qwaq] Move from tools to ruamoko This fixes the dependency issues between qwaq and ruamoko. qwaq is actually older than ruamoko. That little language feature test has come a long way. However, I'm considering moving to non-recursive make, but... --- config.d/ac_config_files.m4 | 3 +-- config.d/build_control.m4 | 9 ++++++--- ruamoko/Makefile.am | 3 ++- {tools => ruamoko}/qwaq/.gdbinit | 0 {tools => ruamoko}/qwaq/Makefile.am | 0 {tools => ruamoko}/qwaq/builtins.c | 0 {tools => ruamoko}/qwaq/color.h | 0 {tools => ruamoko}/qwaq/event.h | 0 {tools => ruamoko}/qwaq/main.c | 0 {tools => ruamoko}/qwaq/progs.src.in | 0 {tools => ruamoko}/qwaq/qwaq-app.h | 0 {tools => ruamoko}/qwaq/qwaq-app.r | 0 {tools => ruamoko}/qwaq/qwaq-bi.c | 0 {tools => ruamoko}/qwaq/qwaq-curses.c | 0 {tools => ruamoko}/qwaq/qwaq-curses.h | 0 {tools => ruamoko}/qwaq/qwaq-view.h | 0 {tools => ruamoko}/qwaq/qwaq-view.r | 0 {tools => ruamoko}/qwaq/qwaq-window.h | 0 {tools => ruamoko}/qwaq/qwaq-window.r | 0 {tools => ruamoko}/qwaq/qwaq.c | 0 {tools => ruamoko}/qwaq/qwaq.h | 0 tools/Makefile.am | 2 +- 22 files changed, 10 insertions(+), 7 deletions(-) rename {tools => ruamoko}/qwaq/.gdbinit (100%) rename {tools => ruamoko}/qwaq/Makefile.am (100%) rename {tools => ruamoko}/qwaq/builtins.c (100%) rename {tools => ruamoko}/qwaq/color.h (100%) rename {tools => ruamoko}/qwaq/event.h (100%) rename {tools => ruamoko}/qwaq/main.c (100%) rename {tools => ruamoko}/qwaq/progs.src.in (100%) rename {tools => ruamoko}/qwaq/qwaq-app.h (100%) rename {tools => ruamoko}/qwaq/qwaq-app.r (100%) rename {tools => ruamoko}/qwaq/qwaq-bi.c (100%) rename {tools => ruamoko}/qwaq/qwaq-curses.c (100%) rename {tools => ruamoko}/qwaq/qwaq-curses.h (100%) rename {tools => ruamoko}/qwaq/qwaq-view.h (100%) rename {tools => ruamoko}/qwaq/qwaq-view.r (100%) rename {tools => ruamoko}/qwaq/qwaq-window.h (100%) rename {tools => ruamoko}/qwaq/qwaq-window.r (100%) rename {tools => ruamoko}/qwaq/qwaq.c (100%) rename {tools => ruamoko}/qwaq/qwaq.h (100%) diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4 index 587a515d9..6f49d4bb5 100644 --- a/config.d/ac_config_files.m4 +++ b/config.d/ac_config_files.m4 @@ -74,8 +74,6 @@ tools/qfvis/Makefile tools/qfvis/include/Makefile tools/qfvis/source/Makefile - tools/qwaq/Makefile - tools/qwaq/progs.src tools/wad/Makefile tools/wav/Makefile @@ -87,6 +85,7 @@ ruamoko/gui/Makefile ruamoko/cl_menu/Makefile ruamoko/scheme/Makefile + ruamoko/qwaq/Makefile pkg-config/Makefile pkg-config/qfcc.pc diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index a53bf74a4..98517088e 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -230,7 +230,8 @@ if test "x$ENABLE_tools_qwaq" = xyes; then if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)" fi - QF_NEED(tools,[qfcc qwaq]) + QF_NEED(tools,[qfcc]) + QF_NEED(ruamoko,[qwaq]) QF_NEED(libs,[ruamoko gamecode util]) fi if test "x$ENABLE_tools_wad" = xyes; then @@ -244,11 +245,13 @@ fi QF_NEED(top, [libs hw nq qtv qw]) -QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav]) -QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav], QF_NEED(top,tools)) +QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav]) +QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav], QF_NEED(top,tools)) QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client]) +QF_PROCESS_NEED_DIRS(ruamoko,[qwaq]) + if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then QF_NEED(top, [ruamoko]) fi diff --git a/ruamoko/Makefile.am b/ruamoko/Makefile.am index 779fc1439..b899690f8 100644 --- a/ruamoko/Makefile.am +++ b/ruamoko/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS= include lib game gui cl_menu scheme +SUBDIRS= include lib game gui cl_menu scheme @ruamoko_dirs@ +DIST_SUBDIRS=qwaq doc: Doxyfile doxygen diff --git a/tools/qwaq/.gdbinit b/ruamoko/qwaq/.gdbinit similarity index 100% rename from tools/qwaq/.gdbinit rename to ruamoko/qwaq/.gdbinit diff --git a/tools/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am similarity index 100% rename from tools/qwaq/Makefile.am rename to ruamoko/qwaq/Makefile.am diff --git a/tools/qwaq/builtins.c b/ruamoko/qwaq/builtins.c similarity index 100% rename from tools/qwaq/builtins.c rename to ruamoko/qwaq/builtins.c diff --git a/tools/qwaq/color.h b/ruamoko/qwaq/color.h similarity index 100% rename from tools/qwaq/color.h rename to ruamoko/qwaq/color.h diff --git a/tools/qwaq/event.h b/ruamoko/qwaq/event.h similarity index 100% rename from tools/qwaq/event.h rename to ruamoko/qwaq/event.h diff --git a/tools/qwaq/main.c b/ruamoko/qwaq/main.c similarity index 100% rename from tools/qwaq/main.c rename to ruamoko/qwaq/main.c diff --git a/tools/qwaq/progs.src.in b/ruamoko/qwaq/progs.src.in similarity index 100% rename from tools/qwaq/progs.src.in rename to ruamoko/qwaq/progs.src.in diff --git a/tools/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h similarity index 100% rename from tools/qwaq/qwaq-app.h rename to ruamoko/qwaq/qwaq-app.h diff --git a/tools/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r similarity index 100% rename from tools/qwaq/qwaq-app.r rename to ruamoko/qwaq/qwaq-app.r diff --git a/tools/qwaq/qwaq-bi.c b/ruamoko/qwaq/qwaq-bi.c similarity index 100% rename from tools/qwaq/qwaq-bi.c rename to ruamoko/qwaq/qwaq-bi.c diff --git a/tools/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c similarity index 100% rename from tools/qwaq/qwaq-curses.c rename to ruamoko/qwaq/qwaq-curses.c diff --git a/tools/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h similarity index 100% rename from tools/qwaq/qwaq-curses.h rename to ruamoko/qwaq/qwaq-curses.h diff --git a/tools/qwaq/qwaq-view.h b/ruamoko/qwaq/qwaq-view.h similarity index 100% rename from tools/qwaq/qwaq-view.h rename to ruamoko/qwaq/qwaq-view.h diff --git a/tools/qwaq/qwaq-view.r b/ruamoko/qwaq/qwaq-view.r similarity index 100% rename from tools/qwaq/qwaq-view.r rename to ruamoko/qwaq/qwaq-view.r diff --git a/tools/qwaq/qwaq-window.h b/ruamoko/qwaq/qwaq-window.h similarity index 100% rename from tools/qwaq/qwaq-window.h rename to ruamoko/qwaq/qwaq-window.h diff --git a/tools/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r similarity index 100% rename from tools/qwaq/qwaq-window.r rename to ruamoko/qwaq/qwaq-window.r diff --git a/tools/qwaq/qwaq.c b/ruamoko/qwaq/qwaq.c similarity index 100% rename from tools/qwaq/qwaq.c rename to ruamoko/qwaq/qwaq.c diff --git a/tools/qwaq/qwaq.h b/ruamoko/qwaq/qwaq.h similarity index 100% rename from tools/qwaq/qwaq.h rename to ruamoko/qwaq/qwaq.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 008638b4a..768efdccb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS=@tools_dirs@ -DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis qwaq wad wav +DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav EXTRA_DIST= \ io_mesh_qfmdl/export_mdl.py io_mesh_qfmdl/import_mdl.py \ io_mesh_qfmdl/__init__.py io_mesh_qfmdl/mdl.py io_mesh_qfmdl/qfplist.py \