configuration tool is now a submodule

diff --git a/.gitmodules b/.gitmodules
index 2c3fd5a2b4079e1bda13d96344cd6aca31be640e..999896599d522b6d75e392f01fc9afa193488956 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "exec"]
        path = exec
        url = ../../botm/exec
+[submodule "config"]
+       path = config
+       url = ../../botm/config

diff --git a/config b/config
new file mode 160000 (submodule)
index 0000000..1c21433
--- /dev/null
+++ b/config
@@ -0,0 +1 @@
+Subproject commit 1c21433837c5bc34100f04bbfeb8ce403844e91d

diff --git a/makefile b/makefile
index e1a23990fe1da9d24e4ec8bdea6574a3292c377d..277394e6d9bb2ec554f25595c85e6385b241c5f4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -20,6 +20,7 @@ TARGET    = debug
 # when want to change target run this first:
 # make -B TARGET=target_name makefile
 endif
+PERL = perl
 
 CC   =gcc
 CF   =-g -Wall
@@ -38,9 +39,7 @@ TMP_PATH = /botm/tmp/test-post
 CONFIGFILE = settings-$(TARGET).txt settings.txt
 
 # The configuration tool
-# http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE = /botm/bin/config/configure.pl
-CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)
+CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
@@ -77,15 +76,18 @@ botm-common/botm_common.pm
 
 all: $(BIN) setuid exec
        
-makefile: makefile.1.mak $(CONFIGFILE)
+makefile: makefile.1.mak $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) < makefile.1.mak > 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
 
 
-$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
+$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
 
-$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt
-       $(PERL) $(CONFIGURE) path=$(BIN_PATH) target=$*.pl exec/settings.txt --in exec/exec.c --out $*.c
+$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt configure.pl
+       $(PERL) configure.pl path=$(BIN_PATH) target=$*.pl exec/settings.txt --in exec/exec.c --out $*.c
        $(CC) $(CF) -o $@ $*.c
 
 exec: $(EXEC)
@@ -116,7 +118,7 @@ endif
 install: all cp_bin cp_lib
        
 clean:
-       $(RM) -f $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)
+       $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)
 
 PHONY: all clean install cp_bin cp_lib
 

diff --git a/makefile.1.mak b/makefile.1.mak
index d8949997ad96cb1804af75d0be99d07686c5b742..f258dde8ff36adc314297c759d51ca2f90586a4b 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -20,6 +20,7 @@ TARGET = debug ###MAKE_TARGET:
 # when want to change target run this first:\r
 # make -B TARGET=target_name makefile\r
 endif\r
+PERL = perl\r
 \r
 ###MAKE_CC:    CC=gcc\r
 ###MAKE_CF:    CF=-g -Wall\r
@@ -38,9 +39,7 @@ endif
 CONFIGFILE = settings-$(TARGET).txt settings.txt\r
 \r
 # The configuration tool\r
-# http://bicyclesonthemoon.info/git/botm-config \r
-CONFIGURE = /botm/bin/config/configure.pl ###MAKE_CONFIGURE:\r
-CONFIGURE_CMD = $(PERL) $(CONFIGURE) $(CONFIGFILE)\r
+CONFIGURE_CMD = $(PERL) ./configure.pl $(CONFIGFILE)\r
 \r
 # keep these 2 lists in the same order!:\r
 GENERATE_FROM=\\r
@@ -77,15 +76,18 @@ botm-common/botm_common.pm
 \r
 all: $(BIN) setuid exec\r
        \r
-makefile: makefile.1.mak $(CONFIGFILE)\r
+makefile: makefile.1.mak $(CONFIGFILE) configure.pl\r
        $(CONFIGURE_CMD) < makefile.1.mak > makefile\r
+       \r
+configure.pl: $(CONFIGFILE) config/configure.1.pl\r
+       $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl\r
 \r
 \r
-$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)\r
+$(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE) configure.pl\r
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)\r
 \r
-$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt\r
-       $(PERL) $(CONFIGURE) path=$(BIN_PATH) target=$*.pl exec/settings.txt --in exec/exec.c --out $*.c\r
+$(PERL_WRAP_EXEC): %: exec/exec.c exec/settings.txt configure.pl\r
+       $(PERL) configure.pl path=$(BIN_PATH) target=$*.pl exec/settings.txt --in exec/exec.c --out $*.c\r
        $(CC) $(CF) -o $@ $*.c\r
 \r
 exec: $(EXEC)\r
@@ -116,7 +118,7 @@ endif
 install: all cp_bin cp_lib\r
        \r
 clean:\r
-       $(RM) -f $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)\r
+       $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)\r
 \r
 PHONY: all clean install cp_bin cp_lib\r
 \r