move merge_settings to common library

[ott/bsta] / makefile

diff --git a/makefile b/makefile
index 5a25a9e8fd42200f9d7cd97d60f5e7afcc188c62..2388b5ef538b814c2e0428dab93624a380a3b3c5 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 # "makefile" is automatically generated from "makefile.1.mak"
 # 
-# Copyright (C) 2016, 2017, 2023  Balthasar Szczepański
+# Copyright (C) 2016, 2017, 2023, 2024  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -33,12 +33,13 @@ PERL =/usr/bin/perl
 RM   =/usr/bin/rm
 SUDO =/usr/bin/sudo
 
-BIN_PATH  = /botm/bin/test-bsta
-DATA_PATH = /botm/data/test-bsta
-LIB_PATH  = /botm/lib/test-bsta
-LOG_PATH  = /botm/log/test-bsta
-TMP_PATH  = /botm/tmp/test-bsta
-WWW_PATH  = /botm/www/1190/bstatest
+BIN_PATH        = /botm/bin/test-bsta
+DATA_PATH       = /botm/data/test-bsta
+DATA_WORDS_PATH = /botm/data/test-bsta/words
+LIB_PATH        = /botm/lib/test-bsta
+LOG_PATH        = /botm/log/test-bsta
+TMP_PATH        = /botm/tmp/test-bsta
+WWW_PATH        = /botm/www/1190/bstatest
 
 CONF = /botm/etc/www/conf/1190/test-bsta.conf
 CRON = /etc/cron.d/test-bsta
@@ -47,7 +48,7 @@ CONFIGFILE = settings-$(TARGET).txt settings.txt
 DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
 
 # The configuration tool
-CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -61,10 +62,10 @@ chat.1.pl\
 frame.1.pl\
 goto.1.pl\
 info.1.pl\
-oldlogs.1.pl\
+opomba.1.pl\
 ong.1.pl\
 reset.1.pl\
-updlist.1.pl\
+update.1.pl\
 viewer.1.pl
 
 TO_GENERATE=\
@@ -78,15 +79,16 @@ chat.pl\
 frame.pl\
 goto.pl\
 info.pl\
-oldlogs.pl\
+opomba.pl\
 ong.pl\
 reset.pl\
-updlist.pl\
+update.pl\
 viewer.pl
 
 DIR=\
 $(BIN_PATH)\
 $(DATA_PATH)\
+$(DATA_WORDS_PATH)\
 $(LIB_PATH)\
 $(LOG_PATH)\
 $(TMP_PATH)\
@@ -94,6 +96,7 @@ $(WWW_PATH)
 
 HIDDEN_DIR=\
 $(DATA_PATH)\
+$(DATA_WORDS_PATH)\
 $(TMP_PATH)
 
 SETUID=\
@@ -104,6 +107,7 @@ chat\
 frame\
 goto\
 info\
+opomba\
 viewer
 
 EXEC=\
@@ -114,10 +118,10 @@ chat.pl\
 frame.pl\
 goto.pl\
 info.pl\
-oldlogs.pl\
+opomba.pl\
 ong.pl\
 reset.pl\
-updlist.pl\
+update.pl\
 viewer.pl
 
 PERL_WRAP_EXEC=\
@@ -128,6 +132,7 @@ chat\
 frame\
 goto\
 info\
+opomba\
 viewer
 
 BIN=\
@@ -135,6 +140,7 @@ $(EXEC)\
 $(PERL_WRAP_EXEC)
 
 LIB=\
+botm-common/botm_common.pm\
 bsta_lib.pm
 
 WWW=\
@@ -144,18 +150,19 @@ timer.js
 
 
 all: $(BIN) setuid exec
+       
 
 makefile: makefile.1.mak $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) < makefile.1.mak > makefile
+       $(CONFIGURE_CMD) --in makefile.1.mak --out makefile
 
 configure.pl: $(CONFIGFILE) config/configure.1.pl
-       $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
+       $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
 
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
+       $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
 $(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt configure.pl
-       $(PERL) configure.pl path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
+       $(PERL) configure.pl --do path=$(BIN_PATH) target=$*.pl io_path=$(LOG_PATH) stderr=$*-stderr.log exec/settings.txt --in exec/exec.c --out $*.c
        $(CC) $(CF) -o $@ $*.c
 
 exec: $(EXEC)
@@ -193,9 +200,11 @@ cp_cron: bsta.cron
        $(SUDO) $(CP) bsta.cron $(CRON)
 
 install: all cp_bin cp_lib cp_www cp_conf cp_cron
+       
 
 clean:
        $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)
-       $(PERL) config/configure.1.pl $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
 
 PHONY: all clean install setuid exec mktree cp_bin cp_lib cp_www cp_conf cp_cron
+