X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2FMakefile;h=f0ae5e46c7201b6c7ef40581c186cf46621a0c62;hb=65fa99f65eece97f5d0e51d809b6742579693efe;hp=8a92e41fb0007c567d8744a27515e2ffc4e2416c;hpb=f0d89e09bcf45a65825782a25f40c878e4593016;p=cc65

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 8a92e41fb..f0ae5e46c 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -4,10 +4,11 @@
 
 .SUFFIXES: .o .obj .s .c
 
-# Defines for executables. The first two are passed to the submakes and are
-# relative to the subdirectories, the last one is used directly.
-AS = ../../src/ca65/ca65
+# Defines for executables. AR is used within this makefile, the others are
+# passed to the submakes and contain paths relative to the subdirectories
+# handled by the make subprocesses.
 AR = ../src/ar65/ar65
+AS = ../../src/ca65/ca65
 CC = ../../src/cc65/cc65
 LD = ../../src/ld65/ld65
 
@@ -86,8 +87,8 @@ vic20lib:
 	for i in vic20 cbm common runtime conio dbg; do \
 	    CC=$(CC) \
 	    AS=$(AS) \
-	    CFLAGS="-Osir -g -T -t c64 -I../../include" \
-	    AFLAGS="-t c64" \
+	    AFLAGS="-t vic20 -I../../asminc" \
+	    CFLAGS="-Osir -g -T -t vic20 -I../../include" \
 	    $(MAKE) -C $$i || exit 1; \
 	done
 	mv vic20/crt0.o vic20.o
@@ -107,7 +108,7 @@ c64lib:
 	    CFLAGS="-Osir -g -T -t c64 -I../../include" \
 	    $(MAKE) -C $$i || exit 1; \
 	done
-	cp c64/crt0.o c64.o
+	mv c64/crt0.o c64.o
 	cp c64/*.tgi .
 	for i in c64 cbm common runtime conio dbg tgi; do \
 	    $(AR) a c64.lib $$i/*.o;\