Deprecated commands mentioned

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index c4c1b78a7cc2eda1e0ebcfc751fc43362b3c26a3..f4aa031014f54e6bf6e402e897d94435960a746b 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -1,4 +1,3 @@
-
 ifneq ($(shell echo),)
   CMD_EXE = 1
 endif
@@ -15,22 +14,25 @@ CBMS = c128   \
 GEOS = geos-apple \
        geos-cbm
 
-TARGETS = apple2    \
-          apple2enh \
-          atari     \
-          atarixl   \
-          atari5200 \
-          atmos     \
-          $(CBMS)   \
-          $(GEOS)   \
-          gamate    \
-          lynx      \
-          nes       \
-          osic1p    \
-          pce       \
-          sim6502   \
-          sim65c02  \
-          supervision
+TARGETS = apple2       \
+          apple2enh    \
+          atari        \
+          atarixl      \
+          atari2600    \
+          atari5200    \
+          atmos        \
+          creativision \
+          $(CBMS)      \
+          $(GEOS)      \
+          gamate       \
+          lynx         \
+          nes          \
+          osic1p       \
+          pce          \
+          sim6502      \
+          sim65c02     \
+          supervision  \
+          telestrat
 
 DRVTYPES = emd \
            joy \
@@ -38,13 +40,13 @@ DRVTYPES = emd \
            ser \
            tgi
 
-OUTPUTDIRS := lib                 \
-              target              \
-              asminc              \
-              cfg                 \
-              include             \
-              samples             \
-              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
+OUTPUTDIRS := lib                                                                             \
+              asminc                                                                          \
+              cfg                                                                             \
+              include                                                                         \
+              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*))) \
+              $(subst ../,,$(wildcard ../target/*/drv/*))                                     \
+              $(subst ../,,$(wildcard ../target/*/util))
 
 .PHONY: all mostlyclean clean install zip lib $(TARGETS)
 
@@ -77,11 +79,8 @@ 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 ../target $(addprefix ../,$(DRVTYPES)))
-#      $(call RMDIR,../libwrk ../lib ../target)
+       $(call RMDIR,../libwrk ../lib ../target)
 
 ifdef CMD_EXE
 
@@ -95,7 +94,7 @@ define INSTALL_recipe
 
 $(if $(prefix),,$(error variable `prefix' must be set))
 $(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
-$(INSTALL) -m644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
+$(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
 
 endef # INSTALL_recipe