Add basic sound support

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 90c1cd3bda3fdf203369f9e174d1f9b1db6a5961..101cca163d55afd6beef5ee6d91a6a048dc86f97 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -11,6 +11,7 @@
 AR = ../src/ar65/ar65
 AS = ../../src/ca65/ca65
 CC = ../../src/cc65/cc65
+CO = ../../src/co65/co65
 LD = ../../src/ld65/ld65
 
 # List of shared directories
@@ -37,8 +38,8 @@ ALLTARGETS =  apple2          \
                c64             \
                cbm510          \
                cbm610          \
-               geos-apple      \
-               geos-cbm        \
+               geos-apple      \
+               geos-cbm        \
                lynx            \
                nes             \
                pet             \
@@ -105,6 +106,7 @@ atarilib:
            $(MAKE) SYS=atari -C $$i || exit 1; \
            $(AR) a atari.lib $$i/*.o || exit 1; \
        done
+       cp atari/atari-130xe.emd atr130xe.emd
        cp atari/atari-stdjoy.joy ataristd.joy
        cp atari/atari-multijoy.joy atarimj8.joy
        cp atari/atari-10.tgi atari10.tgi
@@ -133,11 +135,12 @@ atarilib:
 
 .PHONY:        atmoslib
 atmoslib:
-       for i in runtime atmos common conio em joystick tgi zlib; do \
+       for i in runtime atmos common conio dbg em joystick tgi zlib; do \
            $(MAKE) SYS=atmos -C $$i || exit 1; \
            $(AR) a atmos.lib $$i/*.o || exit 1; \
        done
        cp atmos/*.joy .
+       cp atmos/*.ser .
        cp atmos/*.tgi .
        if [ -d atmos/extra ]; then \
            for i in atmos/extra/*.o; do \
@@ -154,8 +157,8 @@ c16lib:
            $(MAKE) SYS=c16 -C $$i || exit 1; \
            $(AR) a c16.lib $$i/*.o || exit 1; \
        done
-       cp c16/*.joy .
        cp c16/*.emd .
+       cp c16/*.joy .
        if [ -d c16/extra ]; then \
            for i in c16/extra/*.o; do \
                cp $$i c16-`basename $$i` || exit 1; \
@@ -254,18 +257,14 @@ cbm610lib:
 geos-applelib:
        for i in geos-apple geos-common; do \
            $(MAKE) SYS=geos-apple -C $$i || exit 1; \
+           TARGET_OBJS="$$TARGET_OBJS`(cd $$i && printf '%s|' *.o)`"; \
            $(AR) a geos-apple.lib $$i/*.o || exit 1; \
-       done
+       done; \
+       TARGET_OBJS="$${TARGET_OBJS%?}"; \
        for i in runtime common conio em joystick tgi zlib; do \
            $(MAKE) SYS=geos-apple -C $$i || exit 1; \
-           for objfile in $$i/*.o; do \
-               BASENAME=`basename $$objfile`; \
-               if [ -f geos-common/$$BASENAME ]; then \
-                   $(AR) a geos-apple.lib geos-common/$$BASENAME; \
-               else \
-                   $(AR) a geos-apple.lib $$objfile; \
-               fi; \
-           done \
+           SHARED_OBJS=`ls $$i/*.o | grep -vwE "$$TARGET_OBJS"`; \
+           $(AR) a geos-apple.lib $$SHARED_OBJS || exit 1; \
        done
        if [ -d geos-apple/extra ]; then \
            for i in geos-apple/extra/*.o; do \
@@ -280,18 +279,14 @@ geos-applelib:
 geos-cbmlib:
        for i in geos-cbm geos-common; do \
            $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
+           TARGET_OBJS="$$TARGET_OBJS`(cd $$i && printf '%s|' *.o)`"; \
            $(AR) a geos-cbm.lib $$i/*.o || exit 1; \
-       done
+       done; \
+       TARGET_OBJS="$${TARGET_OBJS%?}"; \
        for i in runtime common conio em joystick tgi zlib; do \
            $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
-           for objfile in $$i/*.o; do \
-               BASENAME=`basename $$objfile`; \
-               if [ -f geos-common/$$BASENAME ]; then \
-                   $(AR) a geos-cbm.lib geos-common/$$BASENAME; \
-               else \
-                   $(AR) a geos-cbm.lib $$objfile; \
-               fi; \
-           done \
+           SHARED_OBJS=`ls $$i/*.o | grep -vwE "$$TARGET_OBJS"`; \
+           $(AR) a geos-cbm.lib $$SHARED_OBJS || exit 1; \
        done
        cp geos-cbm/*.emd .
        cp geos-cbm/*.joy .