Renamed the old geos target to geos-cbm.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5343 b7a2c559-68d2-44c3-8de9-860c34a00d81

libsrc/Makefile

@@ -36,7 +36,7 @@ ALLTARGETS =	apple2		\
 		c64		\
 		cbm510		\
 		cbm610		\
-		geos		\
+                geos-cbm        \
 		lynx		\
 		nes		\
 		pet		\
@@ -248,36 +248,36 @@ cbm610lib:
 #-----------------------------------------------------------------------------
 # GEOS on the C64/128
 
-.PHONY:	geoslib
+.PHONY:	geos-cbmlib
-geoslib:
+geos-cbmlib:
 	CC=../$(CC) \
 	AS=../$(AS) \
 	AR=../$(AR) \
 	LD=../$(LD) \
-	AFLAGS="-t geos --forget-inc-paths -I../../../asminc" \
+	AFLAGS="-t geos-cbm --forget-inc-paths -I../../../asminc" \
-	CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../../include" \
+	CFLAGS="-Osir -g -T -t geos-cbm --forget-inc-paths -I. -I../../../include" \
-	$(MAKE) -C geos
+	$(MAKE) -C geos-cbm
 	for i in em joystick tgi conio common runtime zlib; do \
 	    CC=$(CC) \
 	    AS=$(AS) \
 	    LD=$(LD) \
-	    AFLAGS="-t geos --forget-inc-paths -I../../asminc" \
+	    AFLAGS="-t geos-cbm --forget-inc-paths -I../../asminc" \
-	    CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../include" \
+	    CFLAGS="-Osir -g -T -t geos-cbm --forget-inc-paths -I. -I../../include" \
-	    $(MAKE) SYS=geos -C $$i || exit 1; \
+	    $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
 	    for objfile in $$i/*.o; do \
-	        if [ -f geos/$$objfile ]; then \
+	        if [ -f geos-cbm/$$objfile ]; then \
-	      	    $(AR) a geos.lib geos/$$objfile || exit 1; \
+	      	    $(AR) a geos-cbm.lib geos-cbm/$$objfile || exit 1; \
 	      	else \
-	      	    $(AR) a geos.lib $$objfile || exit 1; \
+	      	    $(AR) a geos-cbm.lib $$objfile || exit 1; \
 	      	fi; \
 	    done \
 	done
-	cp geos/devel/*.emd .
+	cp geos-cbm/devel/*.emd .
-	cp geos/devel/*.joy .
+	cp geos-cbm/devel/*.joy .
-	cp geos/devel/*.tgi .
+	cp geos-cbm/devel/*.tgi .
-	if [ -d geos/extra ]; then \
+	if [ -d geos-cbm/extra ]; then \
-	    for i in geos/extra/*.o; do \
+	    for i in geos-cbm/extra/*.o; do \
-	       	cp $$i geos-`basename $$i` || exit 1; \
+	       	cp $$i geos-cbm-`basename $$i` || exit 1; \
 	    done \
 	fi
 

libsrc/geos-cbm/Makefile

@@ -8,7 +8,7 @@ OBJ_DIRS=common conio devel disk dlgbox file graph menuicon memory mousesprite p
 
 all:
 	@for i in $(OBJ_DIRS); do $(MAKE) -C $$i; done
-	@for i in $(OBJ_DIRS); do $(AR) a ../geos.lib $$i/*.o; done
+	@for i in $(OBJ_DIRS); do $(AR) a ../geos-cbm.lib $$i/*.o; done
 
 rebuild: zap all clean