6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 04:30:10 +00:00
Code Issues Projects Releases Wiki Activity

moved output of target utils and drivers to separate directory

Browse Source
This commit is contained in:
Patrycjusz R. Łogiewa 2016-05-13 14:28:58 +02:00
parent b3d84d511c
commit 93f55c274b
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile
View File

@ -41,7 +41,9 @@ ifeq ($(wildcard ../info),../info)
endif endif
zip: zip:
ifneq "$(wildcard ../html)" ""
@cd .. && zip cc65 html/*.* @cd .. && zip cc65 html/*.*
endif
doc: html info doc: html info

24
libsrc/Makefile
View File

@ -37,12 +37,15 @@ DRVTYPES = emd \
ser \ ser \
tgi tgi
OUTPUTDIRS := lib \ DRVOUTPUTDIRS := $(foreach drvtype,$(DRVTYPES),goodies/drivers/$(drvtype))
$(DRVTYPES) \
targetutil \ OUTPUTDIRS := lib \
asminc \ $(DRVOUTPUTDIRS) \
cfg \ goodies/targetutil \
include \ asminc \
cfg \
include \
samples \
$(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*))) $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
.PHONY: all mostlyclean clean install zip lib $(TARGETS) .PHONY: all mostlyclean clean install zip lib $(TARGETS)
@ -76,8 +79,11 @@ all lib: $(TARGETS)
mostlyclean: mostlyclean:
$(call RMDIR,../libwrk) $(call RMDIR,../libwrk)
# Transitional line active. Final line commented out below in order to
# allow some time for transition between the directory structures
clean: clean:
$(call RMDIR,../libwrk ../lib ../targetutil $(addprefix ../,$(DRVTYPES))) $(call RMDIR,../libwrk ../lib ../targetutil ../goodies $(addprefix ../,$(DRVTYPES)))
# $(call RMDIR,../libwrk ../lib ../goodies)
ifdef CMD_EXE ifdef CMD_EXE
@ -212,7 +218,7 @@ define DRVTYPE_template
$1_SRCDIR = $$(SRCDIR)/$1 $1_SRCDIR = $$(SRCDIR)/$1
$1_STCDIR = ../libwrk/$$(TARGET) $1_STCDIR = ../libwrk/$$(TARGET)
$1_DYNDIR = ../libwrk/$$(TARGET)/$1 $1_DYNDIR = ../libwrk/$$(TARGET)/$1
$1_DRVDIR = ../$1 $1_DRVDIR = ../goodies/drivers/$1
$1_SRCPAT = $$($1_SRCDIR)/$$(OBJPFX)%.s $1_SRCPAT = $$($1_SRCDIR)/$$(OBJPFX)%.s
$1_STCPAT = $$($1_STCDIR)/$$(OBJPFX)%-$1.o $1_STCPAT = $$($1_STCDIR)/$$(OBJPFX)%-$1.o
@ -283,7 +289,7 @@ $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../lib
../lib/$(TARGET).lib: $(OBJS) | ../lib ../lib/$(TARGET).lib: $(OBJS) | ../lib
$(AR65) a $@ $? $(AR65) a $@ $?
../libwrk/$(TARGET) ../lib ../targetutil: ../libwrk/$(TARGET) ../lib ../goodies/targetutil:
@$(call MKDIR,$@) @$(call MKDIR,$@)
$(TARGET): $(EXTRA_OBJS) ../lib/$(TARGET).lib $(TARGET): $(EXTRA_OBJS) ../lib/$(TARGET).lib

4
libsrc/apple2/targetutil/Makefile.inc
View File

@ -3,7 +3,7 @@ DEPS += ../libwrk/$(TARGET)/loader.d
../libwrk/$(TARGET)/loader.o: $(SRCDIR)/targetutil/loader.s | ../libwrk/$(TARGET) ../libwrk/$(TARGET)/loader.o: $(SRCDIR)/targetutil/loader.s | ../libwrk/$(TARGET)
$(ASSEMBLE_recipe) $(ASSEMBLE_recipe)
../targetutil/loader.system: ../libwrk/$(TARGET)/loader.o $(SRCDIR)/targetutil/loader.cfg | ../targetutil ../goodies/targetutil/loader.system: ../libwrk/$(TARGET)/loader.o $(SRCDIR)/targetutil/loader.cfg | ../goodies/targetutil
$(LD65) -o $@ -C $(filter %.cfg,$^) $(filter-out %.cfg,$^) $(LD65) -o $@ -C $(filter %.cfg,$^) $(filter-out %.cfg,$^)
$(TARGET): ../targetutil/loader.system $(TARGET): ../goodies/targetutil/loader.system

4
libsrc/atari/targetutil/Makefile.inc
View File

@ -3,7 +3,7 @@ DEPS += ../libwrk/$(TARGET)/w2cas.d
../libwrk/$(TARGET)/w2cas.o: $(SRCDIR)/targetutil/w2cas.c | ../libwrk/$(TARGET) ../libwrk/$(TARGET)/w2cas.o: $(SRCDIR)/targetutil/w2cas.c | ../libwrk/$(TARGET)
$(COMPILE_recipe) $(COMPILE_recipe)
../targetutil/w2cas.com: ../libwrk/$(TARGET)/w2cas.o ../lib/$(TARGET).lib | ../targetutil ../goodies/targetutil/w2cas.com: ../libwrk/$(TARGET)/w2cas.o ../lib/$(TARGET).lib | ../goodies/targetutil
$(LD65) -o $@ -t $(TARGET) $^ $(LD65) -o $@ -t $(TARGET) $^
$(TARGET): ../targetutil/w2cas.com $(TARGET): ../goodies/targetutil/w2cas.com

4
libsrc/geos-apple/targetutil/Makefile.inc
View File

@ -8,7 +8,7 @@ DEPS += ../libwrk/$(TARGET)/convert.d
../lib/apple2enh.lib: ../lib/apple2enh.lib:
@$(MAKE) --no-print-directory apple2enh @$(MAKE) --no-print-directory apple2enh
../targetutil/convert.system: ../libwrk/$(TARGET)/convert.o ../lib/apple2enh.lib | ../targetutil ../goodies/targetutil/convert.system: ../libwrk/$(TARGET)/convert.o ../lib/apple2enh.lib | ../goodies/targetutil
$(LD65) -o $@ -C apple2enh-system.cfg $^ $(LD65) -o $@ -C apple2enh-system.cfg $^
$(TARGET): ../targetutil/convert.system $(TARGET): ../goodies/targetutil/convert.system

16
libsrc/nes/Makefile.inc
View File

@ -1,8 +1,8 @@
../tgi/nes-64-56-2.tgi: ../libwrk/nes/clrscr.o \ ../goodies/drivers/tgi/nes-64-56-2.tgi: ../libwrk/nes/clrscr.o \
../libwrk/nes/cputc.o \ ../libwrk/nes/cputc.o \
../libwrk/nes/get_tv.o \ ../libwrk/nes/get_tv.o \
../libwrk/nes/gotoxy.o \ ../libwrk/nes/gotoxy.o \
../libwrk/nes/popa.o \ ../libwrk/nes/popa.o \
../libwrk/nes/ppu.o \ ../libwrk/nes/ppu.o \
../libwrk/nes/ppubuf.o \ ../libwrk/nes/ppubuf.o \
../libwrk/nes/setcursor.o ../libwrk/nes/setcursor.o