From 8e43d5a73d6bd7494e648cd5387923686df95888 Mon Sep 17 00:00:00 2001 From: Alan C Francis Date: Thu, 4 Jan 2024 21:05:32 +0000 Subject: [PATCH] join all the .o files, not the sub libraries --- smakefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/smakefile b/smakefile index 703ecea..df2824c 100644 --- a/smakefile +++ b/smakefile @@ -14,20 +14,20 @@ LIBS = lib:sc.lib lib:amiga.lib lib:debug.lib $(NAME) : main.o configfile.lib configfile.h slink lib:c.o main.o to $(NAME) noicons lib $(LIBS) configfile.lib $(LFLAGS) -configfile.lib : configfile.o configmodel.o sectionstore.o cregex/cregex.lib containers/containers.lib - JOIN configfile.o configmodel.o sectionstore.o cregex/cregex.lib containers/containers.lib AS configfile.lib +configfile.lib : configfile.o configmodel.o sectionstore.o cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o + JOIN configfile.o configmodel.o sectionstore.o cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o AS configfile.lib -cregex/cregex.lib : cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o - JOIN cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o AS cregex/cregex.lib +#cregex/cregex.lib : cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o +# JOIN cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o AS cregex/cregex.lib -containers/containers.lib : containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o - JOIN containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o AS containers/containers.lib +#containers/containers.lib : containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o +# JOIN containers/stringarray.o containers/linearray.o containers/sectionarray.o containers/sectionmap.o AS containers/containers.lib clean: delete \#?.o $(NAME) ALL QUIET cleanlibs: - delete configfile.lib containers/containers.lib containers/\#?.o cregex/cregex.lib cregex/\#?.o ALL QUIET + delete configfile.lib containers/\#?.o cregex/\#?.o ALL QUIET ###############################################################################