Minor reformatting.

[cc65] / libsrc / apple2 / Makefile

diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile
index 953bf510dfb015645ded34539be8391c43a75bc8..a38de748270ec2912ca5ba42e368ce601dbe851a 100644 (file)
--- a/libsrc/apple2/Makefile
+++ b/libsrc/apple2/Makefile
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
@@ -57,6 +57,7 @@ S_OBJS=       _scrsize.o      \
        close.o         \
        clrscr.o        \
        color.o         \
+        cout.o          \
        cputc.o         \
        crt0.o          \
        ctype.o         \
@@ -75,24 +76,23 @@ S_OBJS=     _scrsize.o      \
         get_ostype.o    \
        gotoxy.o        \
        gotoy.o         \
+        home.o          \
        initcwd.o       \
+       iobuf.o         \
         joy_stddrv.o    \
        kbhit.o         \
         mainargs.o      \
        mcbdefault.o    \
        mli.o           \
+        mouse_stddrv.o  \
        open.o          \
         oserrlist.o     \
        oserror.o       \
         randomize.o     \
-        rcout.o         \
+        rdkey.o         \
        read.o          \
+       reboot.o        \
        revers.o        \
-        rhome.o         \
-        rom.o           \
-        rpread.o        \
-        rrdkey.o        \
-        rvtabz.o        \
        rwcommon.o      \
        syschdir.o      \
        sysmkdir.o      \
@@ -102,14 +102,18 @@ S_OBJS=   _scrsize.o      \
         systime.o       \
         sysuname.o      \
         tgi_mode_table.o\
+        vtabz.o         \
        wherex.o        \
                wherey.o        \
        write.o
 
+S_EXTRA_OBJS=          \
+       extra/iobuf-0800.o
+
 #--------------------------------------------------------------------------
 # Drivers
 
-EMDS = apple2-lc.emd
+EMDS = apple2-auxmem.emd
 
 JOYS = apple2-stdjoy.joy
 
@@ -117,20 +121,20 @@ MOUS = apple2-stdmou.mou
 
 SERS = apple2-ssc.ser
 
-TGIS = apple2-40-40-16.tgi apple2-280-192-6.tgi
+TGIS = apple2-280-192-8.tgi apple2-40-48-16.tgi
 
 #--------------------------------------------------------------------------
 # Targets
 
 .PHONY:        all clean zap
 
-all:   $(C_OBJS) $(S_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS)
+all:   $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS)
 
 ../runtime/zeropage.o:
        $(MAKE) -C $(dir $@) $(notdir $@)
 
 clean:
-       @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o)
+       @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o)
 
 zap:           clean
        @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS)