diff --git a/Makefile b/Makefile index 441376b..c068f5c 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,11 @@ .PHONY: default default: imports -.PHONY: shared -shared: bbstool - .PHONY: static -static: bbstool-static +static: bbstool .PHONY: all -all: imports shared static +all: imports static CSC=csc @@ -62,25 +59,15 @@ BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o dictionary.o \ members-print.o member-fees.o members-dir.o csv-simple.o \ bank-account.o bank-fio.o members-payments.o -BBSTOOL-SHARED=testing.so listing.so month.so period.so ansi.so \ - dictionary.so command-line.so members-base.so utils.so \ - primes.so member-record.so configuration.so progress.so \ - table.so cards.so members-print.so member-fees.so \ - members-dir.so csv-simple.so bank-account.so bank-fio.so \ - members-payments.so - .PHONY: imports imports: $(BBSTOOL-DEPS) bbstool: $(BBSTOOL-DEPS) - $(CSC) -o $@ $< - -bbstool-static: $(BBSTOOL-DEPS) $(CSC) -static -o $@ $(BBSTOOL-SOURCES) .PHONY: clean clean: - rm -f *.c *.so *.link *.o *.import.scm bbstool bbstool-static + rm -f *.c *.so *.link *.o *.import.scm bbstool ################################################################ # Module static and shared object and import source compilation @@ -88,9 +75,6 @@ clean: %.o: %.scm $(CSC) -c $< -%.so: %.scm - $(CSC) -s $< - %.import.scm: %.scm rm -f $@ $(CSC) -P -J $< @@ -100,44 +84,37 @@ clean: TESTING-SOURCES=testing.scm -testing.so: testing.o testing.o: testing.import.scm testing.import.scm: $(TESTING-SOURCES) LISTING-SOURCES=listing.scm testing.import.scm ansi.import.scm -listing.so: listing.o listing.o: listing.import.scm listing.import.scm: $(LISTING-SOURCES) DICTIONARY-SOURCES=dictionary.scm testing.import.scm -dictionary.so: dictionary.o dictionary.o: dictionary.import.scm dictionary.import.scm: $(DICTIONARY-SOURCES) MONTH-SOURCES=month.scm testing.import.scm -month.so: month.o month.o: month.import.scm month.import.scm: $(MONTH-SOURCES) PERIOD-SOURCES=period.scm testing.import.scm month.import.scm \ configuration.import.scm -period.so: period.o period.o: period.import.scm period.import.scm: $(PERIOD-SOURCES) ANSI-SOURCES=ansi.scm testing.import.scm utils.import.scm -ansi.so: ansi.o ansi.o: ansi.import.scm ansi.import.scm: $(ANSI-SOURCES) COMMAND-LINE-SOURCES=command-line.scm testing.import.scm -command-line.so: command-line.o command-line.o: command-line.import.scm command-line.import.scm: $(COMMAND-LINE-SOURCES) @@ -147,19 +124,16 @@ MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm \ month.import.scm configuration.import.scm progress.import.scm \ table.import.scm members-dir.import.scm -members-base.so: members-base.o members-base.o: members-base.import.scm members-base.import.scm: $(MEMBERS-BASE-SOURCES) UTILS-SOURCES=utils.scm testing.import.scm -utils.so: utils.o utils.o: utils.import.scm utils.import.scm: $(UTILS-SOURCES) PRIMES-SOURCES=primes.scm testing.import.scm utils.import.scm -primes.so: primes.o primes.o: primes.import.scm primes.import.scm: $(PRIMES-SOURCES) @@ -167,33 +141,28 @@ MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm \ period.import.scm testing.import.scm month.import.scm \ configuration.import.scm primes.import.scm utils.import.scm -member-record.so: member-record.o member-record.o: member-record.import.scm member-record.import.scm: $(MEMBER-RECORD-SOURCES) CONFIGURATION-SOURCES=configuration.scm month.import.scm -configuration.so: configuration.o configuration.o: configuration.import.scm configuration.import.scm: $(CONFIGURATION-SOURCES) PROGRESS-SOURCES=progress.scm -progress.so: progress.o progress.o: progress.import.scm progress.import.scm: $(PROGRESS-SOURCES) TABLE-SOURCES=table.scm ansi.import.scm testing.import.scm \ utils.import.scm -table.so: table.o table.o: table.import.scm table.import.scm: $(TABLE-SOURCES) CARDS-SOURCES=cards.scm dictionary.import.scm members-base.import.scm \ member-record.import.scm -cards.so: cards.o cards.o: cards.import.scm cards.import.scm: $(CARDS-SOURCES) @@ -201,7 +170,6 @@ MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm \ testing.import.scm dictionary.import.scm month.import.scm \ period.import.scm utils.import.scm configuration.import.scm -member-parser.so: member-parser.o member-parser.o: member-parser.import.scm member-parser.import.scm: $(MEMBER-PARSER-SOURCES) @@ -212,7 +180,6 @@ MEMBERS-PRINT-SOURCES=members-print.scm dictionary.import.scm \ configuration.import.scm bank-account.import.scm \ member-fees.import.scm -members-print.so: members-print.o members-print.o: members-print.import.scm members-print.import.scm: $(MEMBERS-PRINT-SOURCES) @@ -220,7 +187,6 @@ MEMBER-FEES-SOURCES=member-fees.scm configuration.import.scm \ member-record.import.scm month.import.scm table.import.scm \ members-base.import.scm -member-fees.so: member-fees.o member-fees.o: member-fees.import.scm member-fees.import.scm: $(MEMBER-FEES-SOURCES) @@ -228,27 +194,23 @@ MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm \ dictionary.import.scm utils.import.scm \ member-record.import.scm member-parser.import.scm -members-dir.so: members-dir.o members-dir.o: members-dir.import.scm members-dir.import.scm: $(MEMBERS-DIR-SOURCES) CSV-SIMPLE-SOURCES=csv-simple.scm testing.import.scm \ progress.import.scm -csv-simple.so: csv-simple.o csv-simple.o: csv-simple.import.scm csv-simple.import.scm: $(CSV-SIMPLE-SOURCES) BANK-ACCOUNT-SOURCES=bank-account.scm -bank-account.so: bank-account.o bank-account.o: bank-account.import.scm bank-account.import.scm: $(BANK-ACCOUNT-SOURCES) BANK-FIO-SOURCES=bank-fio.scm bank-account.import.scm \ csv-simple.import.scm progress.import.scm -bank-fio.so: bank-fio.o bank-fio.o: bank-fio.import.scm bank-fio.import.scm: $(BANK-FIO-SOURCES) @@ -256,6 +218,5 @@ MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm \ dictionary.import.scm member-fees.import.scm \ period.import.scm -members-payments.so: members-payments.o members-payments.o: members-payments.import.scm members-payments.import.scm: $(MEMBERS-PAYMENTS-SOURCES)