Normalized coding style.

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index a3dbc684daecb53f57d5134001b685e9cc70bd86..90c1cd3bda3fdf203369f9e174d1f9b1db6a5961 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -16,6 +16,7 @@ LD = ../../src/ld65/ld65
 # List of shared directories
 SHAREDDIRS =   cbm             \
                common          \
+               geos-common     \
                conio           \
                dbg             \
                em              \
@@ -36,7 +37,8 @@ ALLTARGETS =  apple2          \
                c64             \
                cbm510          \
                cbm610          \
-                geos-cbm        \
+               geos-apple      \
+               geos-cbm        \
                lynx            \
                nes             \
                pet             \
@@ -245,21 +247,58 @@ cbm610lib:
            done \
        fi
 
+#-----------------------------------------------------------------------------
+# GEOS on the Apple
+
+.PHONY:        geos-applelib
+geos-applelib:
+       for i in geos-apple geos-common; do \
+           $(MAKE) SYS=geos-apple -C $$i || exit 1; \
+           $(AR) a geos-apple.lib $$i/*.o || exit 1; \
+       done
+       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 \
+       done
+       if [ -d geos-apple/extra ]; then \
+           for i in geos-apple/extra/*.o; do \
+               cp $$i geos-apple-`basename $$i` || exit 1; \
+           done \
+       fi
+
 #-----------------------------------------------------------------------------
 # GEOS on the C64/128
 
 .PHONY:        geos-cbmlib
 geos-cbmlib:
-       for i in runtime geos-cbm common conio em joystick tgi zlib; do \
+       for i in geos-cbm geos-common; do \
            $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
            $(AR) a geos-cbm.lib $$i/*.o || exit 1; \
        done
+       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 \
+       done
        cp geos-cbm/*.emd .
        cp geos-cbm/*.joy .
        cp geos-cbm/*.tgi .
        if [ -d geos-cbm/extra ]; then \
            for i in geos-cbm/extra/*.o; do \
-               cp $$i geos-cbm-`basename $$i` || exit 1; \
+               cp $$i geos-cbm-`basename $$i` || exit 1; \
            done \
        fi