moved output of target utils and drivers to separate directory

diff --git a/doc/Makefile b/doc/Makefile
index 967443ef0091eb12be9bcf7e6c6595c1f9a227c3..8b0b316b0de7cdebb6aa07e9b96a73cfa6915501 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -41,7 +41,9 @@ ifeq ($(wildcard ../info),../info)
 endif
 
 zip:
+ifneq "$(wildcard ../html)" ""
        @cd .. && zip cc65 html/*.*
+endif
 
 doc: html info
 

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

diff --git a/libsrc/apple2/targetutil/Makefile.inc b/libsrc/apple2/targetutil/Makefile.inc
index 105a5324fb356b054f7eca182408593009dd9487..0b8b39e1fbc2f638949ba2f61a9fc88a4487c72d 100644 (file)
--- a/libsrc/apple2/targetutil/Makefile.inc
+++ b/libsrc/apple2/targetutil/Makefile.inc
@@ -3,7 +3,7 @@ DEPS += ../libwrk/$(TARGET)/loader.d
 ../libwrk/$(TARGET)/loader.o: $(SRCDIR)/targetutil/loader.s | ../libwrk/$(TARGET)
        $(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,$^)
 
-$(TARGET): ../targetutil/loader.system
+$(TARGET): ../goodies/targetutil/loader.system

diff --git a/libsrc/atari/targetutil/Makefile.inc b/libsrc/atari/targetutil/Makefile.inc
index 05405f2e6b46e442b8197c55dc786bf412cf6712..42903a3ca69321a1625f8f0a1621ed82ad0b1041 100644 (file)
--- a/libsrc/atari/targetutil/Makefile.inc
+++ b/libsrc/atari/targetutil/Makefile.inc
@@ -3,7 +3,7 @@ DEPS += ../libwrk/$(TARGET)/w2cas.d
 ../libwrk/$(TARGET)/w2cas.o: $(SRCDIR)/targetutil/w2cas.c | ../libwrk/$(TARGET)
        $(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) $^
 
-$(TARGET): ../targetutil/w2cas.com
+$(TARGET): ../goodies/targetutil/w2cas.com

diff --git a/libsrc/geos-apple/targetutil/Makefile.inc b/libsrc/geos-apple/targetutil/Makefile.inc
index fbe31981c1978e173d12e0b97b7ca647cf934f13..d842b4d3f5c0029e75d601fe880b624e2934119d 100644 (file)
--- a/libsrc/geos-apple/targetutil/Makefile.inc
+++ b/libsrc/geos-apple/targetutil/Makefile.inc
@@ -8,7 +8,7 @@ DEPS += ../libwrk/$(TARGET)/convert.d
 ../lib/apple2enh.lib:
        @$(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 $^
 
-$(TARGET): ../targetutil/convert.system
+$(TARGET): ../goodies/targetutil/convert.system

diff --git a/libsrc/nes/Makefile.inc b/libsrc/nes/Makefile.inc
index f1dcbf18e697bf4fd3dd1aa7fc0c105663b92ebf..aaebef1dbfbe54556450f647199af1c5b47434fb 100644 (file)
--- a/libsrc/nes/Makefile.inc
+++ b/libsrc/nes/Makefile.inc
@@ -1,8 +1,8 @@
-../tgi/nes-64-56-2.tgi: ../libwrk/nes/clrscr.o \
-                        ../libwrk/nes/cputc.o  \
-                        ../libwrk/nes/get_tv.o \
-                        ../libwrk/nes/gotoxy.o \
-                        ../libwrk/nes/popa.o   \
-                        ../libwrk/nes/ppu.o    \
-                        ../libwrk/nes/ppubuf.o \
-                        ../libwrk/nes/setcursor.o
+../goodies/drivers/tgi/nes-64-56-2.tgi: ../libwrk/nes/clrscr.o \
+                                               ../libwrk/nes/cputc.o  \
+                                               ../libwrk/nes/get_tv.o \
+                                               ../libwrk/nes/gotoxy.o \
+                                               ../libwrk/nes/popa.o   \
+                                               ../libwrk/nes/ppu.o    \
+                                               ../libwrk/nes/ppubuf.o \
+                                               ../libwrk/nes/setcursor.o