From 1a6f339d9d78d86dbe0ffeeab30a589cc6324d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Thu, 16 Mar 2023 14:05:47 +0100 Subject: [PATCH] Work on static linkage. --- Makefile | 20 +++++++++++++++----- brmsaptool.scm | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c30851c..232ab02 100644 --- a/Makefile +++ b/Makefile @@ -23,10 +23,20 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -brmsaptool: brmsaptool.o testing.o listing.o month.o period.o ansi.o \ - member-file.o dictionary.o command-line.o \ +.PHONY: all +all: brmsaptool brmsaptool-static + +CSC=csc + +BRMSAPTOOL-SOURCES=brmsaptool.o testing.o listing.o month.o period.o \ + ansi.o member-file.o dictionary.o command-line.o \ members-base.o utils.o - csc -o brmsaptool $^ + +brmsaptool: $(BRMSAPTOOL-SOURCES) + $(CSC) -o $@ $^ + +brmsaptool-static: brmsaptool.scm $(BRMSAPTOOL-SOURCES) + $(CSC) -static -o $@ $< .PHONY: clean clean: @@ -36,10 +46,10 @@ clean: # Module shared object and import source compilation %.o: %.scm - csc -c $< + $(CSC) -c $< %.import.scm: %.scm - csc -c -J $< + $(CSC) -c -J $< ################################################################ # Modules diff --git a/brmsaptool.scm b/brmsaptool.scm index 938952b..a5e94c7 100644 --- a/brmsaptool.scm +++ b/brmsaptool.scm @@ -69,7 +69,7 @@ (-mfkw () "Member-File invalid Key Warning" (*member-file-check-syntax* 'warning)) (-mfkq () "Member-File invalid Key Quiet" (*member-file-check-syntax* 'quiet)) (-mfec (n) "Member-File parser Error Context (lines)" (*member-file-context* (string->number n))) - (-mi (id) "Specif member by id" (-member-id- (string->number id))) + (-mi (id) "Specify member by id" (-member-id- (string->number id))) (-mn (nick) "Specify member by nick" (-member-nick- nick)) ) @@ -80,7 +80,7 @@ (define mr (if (-member-id-) (find-member-by-id MB (-member-id-)) (if (-member-nick-) - (find-member-by-nick (-member-nick-)) + (find-member-by-nick MB (-member-nick-)) #f))) ;; ...