Merged branch "master" into make.

diff --combined libsrc/Makefile
index fb716067be822a3c93c112ebfe355d9db17dad33,f65515abc0dbb81b67a9303e0bb3d5403e3f8d8f..79dcde6dddfbf68e1572b0884c752163fd6fc060
--- 1/libsrc/Makefile
--- 2/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -10,17 -10,18 +10,18 @@@ CBMS = c128   
  GEOS = geos-apple \
         geos-cbm
  
- TARGETS = apple2    \
-           apple2enh \
-           atari     \
-           atarixl   \
-           atmos     \
-           $(CBMS)   \
-           $(GEOS)   \
-           lynx      \
-           nes       \
-           sim6502   \
-           sim65c02  \
+ TARGETS = apple2       \
+           apple2enh    \
+           atari        \
+           atarixl      \
+           atmos        \
+           creativision \
+           $(CBMS)      \
+           $(GEOS)      \
+           lynx         \
+           nes          \
+           sim6502      \
+           sim65c02     \
            supervision
  
  DRVTYPES = emd \
@@@ -178,7 -179,7 +179,7 @@@ $1_STCS = $$(patsubst $$($1_DRVPAT),$$(
  $$($1_OBJS): | $$($1_OBJDIR)
  
  $$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
 -      @echo $$(TARGET) - $$(@F)
 +      @echo $$(TARGET) - $$(<F)
        @$$(LD65) -o $$@ -t module $$^
  
  $$($1_OBJDIR) $$($1_DRVDIR):
@@@ -237,7 -238,7 +238,7 @@@ ende
        $(COMPILE_recipe)
  
  $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../lib
 -      @echo $(TARGET) - $(@F)
 +      @echo $(TARGET) - $(<F)
        @$(CA65) -t $(TARGET) $(CA65FLAGS) -o $@ $<
  
  ../lib/$(TARGET).lib: $(OBJS) | ../lib