The cc65 library build system is designed to call sub-makes in direct sub-directories of 'libsrc' only (meaning that sub-sub-directories are not supported). The GEOSLib source files however are organized in sub-directories of the 'libsrc/geos-cbm'. This mismatch was up to now handled by replicating the cc65 library build system functionality to allow for individal sub-makes in each 'libsrc/geos-cbm' sub-directory. This is unnecessarily hard understand and causes additional maintainance effort.

Now the whole GEOSLib is built in a single make instance running in 'libsrc/geos-cbm' - which is just what the cc65 library build system can handle. The 'libsrc/geos-cbm' sub-directories still contain Makefiles. However those files only define the set of object files to create from their sub-directory and get included into the 'libsrc/geos-cbm' Makefile. git-svn-id: svn://svn.cc65.org/cc65/trunk@5429 b7a2c559-68d2-44c3-8de9-860c34a00d81
2012-01-30 21:19:09 +00:00
parent 0fb3e47b60
commit 0c69d4866c
15 changed files with 315 additions and 285 deletions
--- a/libsrc/geos-cbm/Makefile
+++ b/libsrc/geos-cbm/Makefile
@@ -1,27 +1,95 @@
 #
-# Makefile for GEOS lib
-# for cc65
+# makefile for CC65 runtime library
 #
-# Maciej 'YTM/Elysium' Witkowiak

-OBJ_DIRS=common conio devel disk dlgbox file graph menuicon memory mousesprite process runtime system
+.SUFFIXES: .o .s .c

-all:
-	@for i in $(OBJ_DIRS); do $(MAKE) -C $$i; done
-	@for i in $(OBJ_DIRS); do $(AR) a ../geos-cbm.lib $$i/*.o; done
+#--------------------------------------------------------------------------
+# Programs and flags

-rebuild: zap all clean
+SYS	= geos-cbm

+AS	= ../../src/ca65/ca65
+CC	= ../../src/cc65/cc65
+LD	= ../../src/ld65/ld65
+
+AFLAGS	= -t $(SYS) --forget-inc-paths -I../../asminc
+CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
+
+#--------------------------------------------------------------------------
+# Rules
+
+%.o:   	%.c
+	@$(CC) -o $(notdir $(*).s) $(CFLAGS) $<
+	@$(AS) -o $@ $(AFLAGS) $(*).s
+
+%.o:	%.s
+	@$(AS) -g -o $@ $(AFLAGS) $<
+
+%.emd:	%.o ../runtime/zeropage.o
+	@$(LD) -o $@ -t module $^
+
+%.joy:	%.o ../runtime/zeropage.o
+	@$(LD) -o $@ -t module $^
+
+%.mou:	%.o ../runtime/zeropage.o
+	@$(LD) -o $@ -t module $^
+
+%.ser:	%.o ../runtime/zeropage.o
+	@$(LD) -o $@ -t module $^
+
+%.tgi:	%.o ../runtime/zeropage.o
+	@$(LD) -o $@ -t module $^
+
+#--------------------------------------------------------------------------
+# Directories
+
+DIRS =	common		\
+	conio		\
+	devel		\
+	disk		\
+	dlgbox		\
+	file		\
+	graph		\
+	menuicon	\
+	memory		\
+	mousesprite	\
+	process		\
+	runtime		\
+	system
+
+#--------------------------------------------------------------------------
+# Drivers
+
+EMDS = geos-vdc.emd
+
+JOYS = geos-stdjoy.joy
+
+MOUS = #geos-stdmou.mou
+
+SERS =
+
+TGIS = geos-tgi.tgi
+
+#--------------------------------------------------------------------------
+# Directives
+
+include $(addsuffix /Makefile, $(DIRS))
+vpath %.c $(DIRS)
+vpath %.s $(DIRS)
+
+#--------------------------------------------------------------------------
+# Targets
+
+.PHONY:	all clean zap
+
+all: 	$(C_OBJS) $(S_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS)
+
+../runtime/zeropage.o:
+	$(MAKE) -C $(dir $@) $(notdir $@)

-.PHONY: clean
 clean:
-	@for i in $(OBJ_DIRS); do \
-	    cd $$i;				\
-	    $(MAKE) clean;			\
-	    cd ..;				\
-	done
+	@$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o)

-.PHONY: zap
 zap:	clean
-	@$(RM) ../geos-cbm.lib
-
+	@$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS)