Fixed problems that were introduced with r4287.

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 32a57c24d14fc292f8f9b648029d39cb845504b6..2ba17bf09c6bd2eab7a60b023240a5e3acddc525 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -46,31 +46,37 @@ apple2lib:
                    $(MAKE) SYS=apple2 -C $$i || exit 1; \
            $(AR) a apple2.lib $$i/*.o;\
        done
-       mv apple2/crt0.o apple2.o
        cp apple2/apple2-auxmem.emd a2.auxmem.emd
-       cp apple2/apple2-lc.emd a2.lc.emd
        cp apple2/apple2-stdjoy.joy a2.stdjoy.joy
        cp apple2/apple2-stdmou.mou a2.stdmou.mou
        cp apple2/apple2-ssc.ser a2.ssc.ser
-       cp apple2/apple2-40-40-16.tgi a2.lo.tgi
-       cp apple2/apple2-280-192-6.tgi a2.hi.tgi
+       cp apple2/apple2-280-192-8.tgi a2.hi.tgi
+       cp apple2/apple2-40-48-16.tgi a2.lo.tgi
+       if [ -d apple2/extra ]; then \
+           for i in apple2/extra/*.o; do \
+               cp $$i apple2-`basename $$i`; \
+           done \
+       fi \
 
 #-----------------------------------------------------------------------------
-# Apple //e
+# enhanced Apple //e
 
 apple2enhlib:
        for i in apple2enh common runtime conio dbg em joystick mouse serial tgi zlib; do \
            $(MAKE) SYS=apple2enh -C $$i || exit 1; \
            $(AR) a apple2enh.lib $$i/*.o;\
        done
-       mv apple2enh/crt0.o apple2enh.o
        cp apple2enh/apple2-auxmem.emd a2e.auxmem.emd
-       cp apple2enh/apple2-lc.emd a2e.lc.emd
        cp apple2enh/apple2-stdjoy.joy a2e.stdjoy.joy
        cp apple2enh/apple2-stdmou.mou a2e.stdmou.mou
        cp apple2enh/apple2-ssc.ser a2e.ssc.ser
-       cp apple2enh/apple2-40-40-16.tgi a2e.lo.tgi
-       cp apple2enh/apple2-280-192-6.tgi a2e.hi.tgi
+       cp apple2enh/apple2-280-192-8.tgi a2e.hi.tgi
+       cp apple2enh/apple2-40-48-16.tgi a2e.lo.tgi
+       if [ -d apple2enh/extra ]; then \
+           for i in apple2enh/extra/*.o; do \
+               cp $$i apple2enh-`basename $$i`; \
+           done \
+       fi \
 
 #-----------------------------------------------------------------------------
 # Atari
@@ -80,8 +86,8 @@ atarilib:
                    $(MAKE) SYS=atari -C $$i || exit 1; \
            $(AR) a atari.lib $$i/*.o;\
        done
-       mv atari/crt0.o atari.o
        cp atari/atari-stdjoy.joy ataristd.joy
+       cp atari/atari-multijoy.joy atarimj8.joy
 
 #-----------------------------------------------------------------------------
 # Oric Atmos
@@ -91,7 +97,6 @@ atmoslib:
                    $(MAKE) SYS=atmos -C $$i || exit 1; \
            $(AR) a atmos.lib $$i/*.o;\
        done
-       mv atmos/crt0.o atmos.o
        cp atmos/*.tgi .
 
 #-----------------------------------------------------------------------------
@@ -102,7 +107,6 @@ c16lib:
                    $(MAKE) SYS=c16 -C $$i || exit 1; \
            $(AR) a c16.lib $$i/*.o;\
        done
-       mv c16/crt0.o c16.o
        cp c16/*.joy .
        cp c16/*.emd .
 
@@ -114,11 +118,11 @@ c64lib:
            $(MAKE) SYS=c64 -C $$i || exit 1; \
            $(AR) a c64.lib $$i/*.o;\
        done
-       mv c64/crt0.o c64.o
        cp c64/*.emd .
        cp c64/*.joy .
        cp c64/c64-1351.mou .
        cp c64/c64-joymouse.mou c64-joy.mou
+       cp c64/c64-potmouse.mou c64-pot.mou
        cp c64/*.ser .
        cp c64/c64-320-200-2.tgi c64-hi.tgi
 
@@ -130,11 +134,11 @@ c128lib:
            $(MAKE) SYS=c128 -C $$i || exit 1; \
            $(AR) a c128.lib $$i/*.o;\
        done
-       mv c128/crt0.o c128.o
        cp c128/*.emd .
        cp c128/*.joy .
        cp c128/c128-1351.mou .
        cp c128/c128-joymouse.mou c128-joy.mou
+       cp c128/c128-potmouse.mou c128-pot.mou
        cp c128/*.ser .
        cp c128/c128-640-200-2.tgi c128-vdc.tgi
        cp c128/c128-640-480-2.tgi c128-vdc2.tgi
@@ -147,7 +151,6 @@ cbm510lib:
            $(MAKE) SYS=cbm510 -C $$i || exit 1; \
            $(AR) a cbm510.lib $$i/*.o;\
        done
-       mv cbm510/crt0.o cbm510.o
        cp cbm510/*.emd .
        cp cbm510/cbm510-stdjoy.joy cbm510-std.joy
        cp cbm510/cbm510-stdser.ser cbm510-std.ser
@@ -160,7 +163,6 @@ cbm610lib:
            $(MAKE) SYS=cbm610 -C $$i || exit 1; \
            $(AR) a cbm610.lib $$i/*.o;\
        done
-       mv cbm610/crt0.o cbm610.o
        cp cbm610/*.emd .
        cp cbm610/cbm610-stdser.ser cbm610-std.ser
 
@@ -199,13 +201,13 @@ geoslib:
 # Lynx
 
 lynxlib:
-       for i in lynx common conio runtime em joystick tgi zlib; do \
+       for i in lynx common conio runtime em joystick serial tgi zlib; do \
            $(MAKE) SYS=lynx -C $$i || exit 1; \
            $(AR) a lynx.lib $$i/*.o;\
        done
-       mv lynx/crt0.o lynx.o
        cp lynx/*.joy .
        cp lynx/*.tgi .
+       cp lynx/*.ser .
 
 #-----------------------------------------------------------------------------
 # NES
@@ -215,7 +217,6 @@ neslib:
            $(MAKE) SYS=nes -C $$i || exit 1; \
            $(AR) a nes.lib $$i/*.o;\
        done
-       mv nes/crt0.o nes.o
        cp nes/*.joy .
 
 #-----------------------------------------------------------------------------
@@ -226,7 +227,6 @@ petlib:
            $(MAKE) SYS=pet -C $$i || exit 1; \
            $(AR) a pet.lib $$i/*.o;\
        done
-       mv pet/crt0.o pet.o
        cp pet/*.joy .
 
 #-----------------------------------------------------------------------------
@@ -237,7 +237,6 @@ plus4lib:
            $(MAKE) SYS=plus4 -C $$i || exit 1; \
            $(AR) a plus4.lib $$i/*.o;\
        done
-       mv plus4/crt0.o plus4.o
        cp plus4/*.joy .
        cp plus4/*.ser .
 
@@ -249,7 +248,6 @@ supervisionlib:
            $(MAKE) SYS=supervision -C $$i || exit 1; \
            $(AR) a supervision.lib $$i/*.o;\
        done
-       mv supervision/crt0.o supervision.o
 
 #-----------------------------------------------------------------------------
 # Vic20
@@ -259,7 +257,6 @@ vic20lib:
            $(MAKE) SYS=vic20 -C $$i || exit 1; \
            $(AR) a vic20.lib $$i/*.o;\
        done
-       mv vic20/crt0.o vic20.o
        cp vic20/*.joy .
 
 #-----------------------------------------------------------------------------