X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2FMakefile;fp=libsrc%2FMakefile;h=b35ae1e382c171441999cbe96deadb11a471e7a9;hb=0b186407f1117529f0f6902569f9d24bc8b1b979;hp=9955d6d77d3725e5752e7be96034cc3d27261f0f;hpb=9fd27d6ef607da31299a06f86b13bc06fe7deadc;p=cc65

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 9955d6d77..b35ae1e38 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -1,3 +1,7 @@
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
 CBMS = c128   \
        c16    \
        c64    \
@@ -14,6 +18,7 @@ TARGETS = apple2    \
           apple2enh \
           atari     \
           atarixl   \
+          atari5200 \
           atmos     \
           c1p       \
           $(CBMS)   \
@@ -30,6 +35,27 @@ DRVTYPES = emd \
            ser \
            tgi
 
+OUTPUTDIRS := lib         \
+              $(DRVTYPES) \
+              targetutil  \
+              asminc      \
+              cfg         \
+              include     \
+              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
+
+.PHONY: all mostlyclean clean install zip lib $(TARGETS)
+
+.SUFFIXES:
+
+ifdef CMD_EXE
+  DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
+else
+  MKDIR = mkdir -p $1
+  RMDIR = $(RM) -r $1
+endif
+
 # Every target requires its individual vpath setting but the vpath directive
 # acts globally. Therefore each target is built in a separate make instance.
 
@@ -39,37 +65,55 @@ ifeq ($(words $(MAKECMDGOALS)),1)
   endif
 endif
 
-DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
+ifndef TARGET
 
-ifeq ($(shell echo),)
-  MKDIR = mkdir -p $1
-  RMDIR = $(RM) -r $1
-else
-  MKDIR = mkdir $(subst /,\,$1)
-  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
-endif
+datadir = $(prefix)/share/cc65
 
-.SUFFIXES:
+all lib: $(TARGETS)
 
-.PHONY: all lib $(TARGETS) mostlyclean clean
+mostlyclean:
+	$(call RMDIR,../libwrk)
 
-ifndef TARGET
+clean:
+	$(call RMDIR,../libwrk ../lib ../targetutil $(addprefix ../,$(DRVTYPES)))
 
-all lib: $(TARGETS)
+ifdef CMD_EXE
 
-$(TARGETS):
-	@$(MAKE) --no-print-directory $@
+install:
 
-mostlyclean:
-	$(call RMDIR,../wrk)
+else # CMD_EXE
 
-clean:
-	$(call RMDIR,../wrk ../lib ../targetutil $(addprefix ../,$(DRVTYPES)))
+INSTALL = install
+
+define INSTALL_recipe
+
+$(if $(prefix),,$(error variable `prefix' must be set))
+$(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
+$(INSTALL) -m644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
+
+endef # INSTALL_recipe
+
+install:
+	$(foreach dir,$(OUTPUTDIRS),$(INSTALL_recipe))
+
+endif # CMD_EXE
+
+define ZIP_recipe
+
+@cd .. && zip cc65 $(dir)/*.*
+
+endef # ZIP_recipe
+
+zip:
+	$(foreach dir,$(OUTPUTDIRS),$(ZIP_recipe))
+
+$(TARGETS):
+	@$(MAKE) --no-print-directory $@
 
 else # TARGET
 
 CA65FLAGS =
-CC65FLAGS = -Osir -W error
+CC65FLAGS = -Or -W error
 
 EXTZP = cbm510 \
         cbm610 \
@@ -77,9 +121,12 @@ EXTZP = cbm510 \
 
 MKINC = $(GEOS) \
         atari   \
+        atarixl \
         nes
 
-TARGETUTIL = apple2 \
+TARGETUTIL = apple2    \
+             apple2enh \
+             atari     \
              geos-apple
 
 GEOSDIRS = common      \
@@ -137,7 +184,7 @@ vpath %.c $(SRCDIRS)
 OBJS := $(patsubst %.s,%.o,$(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.s)))
 OBJS += $(patsubst %.c,%.o,$(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.c)))
 
-OBJS := $(addprefix ../wrk/$(TARGET)/,$(sort $(notdir $(OBJS))))
+OBJS := $(addprefix ../libwrk/$(TARGET)/,$(sort $(notdir $(OBJS))))
 
 DEPS = $(OBJS:.o=.d)
 
@@ -145,106 +192,96 @@ EXTRA_SRCPAT = $(SRCDIR)/extra/%.s
 EXTRA_OBJPAT = ../lib/$(TARGET)-%.o
 EXTRA_OBJS := $(patsubst $(EXTRA_SRCPAT),$(EXTRA_OBJPAT),$(wildcard $(SRCDIR)/extra/*.s))
 
-ZPOBJ = ../wrk/$(TARGET)/zeropage.o
+ZPOBJ = ../libwrk/$(TARGET)/zeropage.o
 ifeq ($(TARGET),$(filter $(TARGET),$(EXTZP)))
-  ZPOBJ += ../wrk/$(TARGET)/extzp.o
+  ZPOBJ += ../libwrk/$(TARGET)/extzp.o
 endif
 
-ifeq ($(SRCDIR),$(filter $(SRCDIR),$(MKINC)))
+ifeq ($(TARGET),$(filter $(TARGET),$(MKINC)))
   include $(SRCDIR)/Makefile.inc
 endif
 
-ifeq ($(SRCDIR),$(filter $(SRCDIR),$(TARGETUTIL)))
+ifeq ($(TARGET),$(filter $(TARGET),$(TARGETUTIL)))
   include $(SRCDIR)/targetutil/Makefile.inc
 endif
 
-##########
-
 define DRVTYPE_template
 
 $1_SRCDIR = $$(SRCDIR)/$1
-$1_OBJDIR = ../wrk/$$(TARGET)/$1
+$1_STCDIR = ../libwrk/$$(TARGET)
+$1_DYNDIR = ../libwrk/$$(TARGET)/$1
 $1_DRVDIR = ../$1
 
-$1_OBJPAT = $$($1_OBJDIR)/$$(OBJPFX)%.o
+$1_SRCPAT = $$($1_SRCDIR)/$$(OBJPFX)%.s
+$1_STCPAT = $$($1_STCDIR)/$$(OBJPFX)%-$1.o
+$1_DYNPAT = $$($1_DYNDIR)/$$(OBJPFX)%.o
 $1_DRVPAT = $$($1_DRVDIR)/$$(DRVPFX)%.$1
-$1_STCPAT = ../wrk/$$(TARGET)/$$(DRVPFX)%-$1.o
 
-$1_OBJS := $$(patsubst $$($1_SRCDIR)/%.s,$$($1_OBJDIR)/%.o,$$(wildcard $$($1_SRCDIR)/*.s))
+$1_SRCS := $$(wildcard $$($1_SRCDIR)/*.s)
+$1_STCS = $$(patsubst $$($1_SRCPAT),$$($1_STCPAT),$$($1_SRCS))
+$1_DYNS = $$(patsubst $$($1_SRCPAT),$$($1_DYNPAT),$$($1_SRCS))
+$1_DRVS = $$(patsubst $$($1_DYNPAT),$$($1_DRVPAT),$$($1_DYNS))
 
-$1_DRVS = $$(patsubst $$($1_OBJPAT),$$($1_DRVPAT),$$($1_OBJS))
+$$($1_STCPAT): $$($1_SRCPAT)
+	@echo $$(TARGET) - $$< - static
+	@$$(CA65) -t $$(TARGET) -D DYN_DRV=0 $$(CA65FLAGS) --create-dep $$(@:.o=.d) -o $$@ $$<
 
-$1_STCS = $$(patsubst $$($1_DRVPAT),$$($1_STCPAT),$$($1_DRVS))
+OBJS += $$($1_STCS)
+DEPS += $$($1_STCS:.o=.d)
 
-$$($1_OBJS): | $$($1_OBJDIR)
+$$($1_DYNS): | $$($1_DYNDIR)
 
-$$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
-	@echo $$(TARGET) - $$(@F)
+$$($1_DRVPAT): $$($1_DYNPAT) $$(ZPOBJ) | $$($1_DRVDIR)
+	@echo $$(TARGET) - $$(<F)
 	@$$(LD65) -o $$@ -t module $$^
 
-$$($1_OBJDIR) $$($1_DRVDIR):
+$$($1_DYNDIR) $$($1_DRVDIR):
 	@$$(call MKDIR,$$@)
 
 $(TARGET): $$($1_DRVS)
 
-$$($1_STCPAT): $$($1_DRVPAT)
-	@echo $$(TARGET) - $$(<F)
-	@$$(CO65) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
-	@$$(CA65) -t $$(TARGET) -o $$@ $$(@:.o=.s)
+DEPS += $$($1_DYNS:.o=.d)
 
-OBJS += $$($1_STCS)
-
-DEPS += $$($1_OBJS:.o=.d)
-
-endef
-
-##########
+endef # DRVTYPE_template
 
 $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
 
 AR65 := $(if $(wildcard ../bin/ar65*),../bin/ar65,ar65)
 CA65 := $(if $(wildcard ../bin/ca65*),../bin/ca65,ca65)
 CC65 := $(if $(wildcard ../bin/cc65*),../bin/cc65,cc65)
-CO65 := $(if $(wildcard ../bin/co65*),../bin/co65,co65)
 LD65 := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 
 export CC65_HOME := $(abspath ..)
 
-##########
-
 define ASSEMBLE_recipe
 
-$(if $(TRAVIS),,@echo $(TARGET) - $<)
+$(if $(QUIET),,@echo $(TARGET) - $<)
 @$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
 
-endef
-
-##########
+endef # ASSEMBLE_recipe
 
 define COMPILE_recipe
 
-$(if $(TRAVIS),,@echo $(TARGET) - $<)
+$(if $(QUIET),,@echo $(TARGET) - $<)
 @$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
 @$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
 
-endef
-
-##########
+endef # COMPILE_recipe
 
-../wrk/$(TARGET)/%.o: %.s | ../wrk/$(TARGET)
+../libwrk/$(TARGET)/%.o: %.s | ../libwrk/$(TARGET)
 	$(ASSEMBLE_recipe)
 
-../wrk/$(TARGET)/%.o: %.c | ../wrk/$(TARGET)
+../libwrk/$(TARGET)/%.o: %.c | ../libwrk/$(TARGET)
 	$(COMPILE_recipe)
 
 $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../lib
-	@echo $(TARGET) - $(@F)
+	@echo $(TARGET) - $(<F)
 	@$(CA65) -t $(TARGET) $(CA65FLAGS) -o $@ $<
 
 ../lib/$(TARGET).lib: $(OBJS) | ../lib
 	$(AR65) a $@ $?
 
-../wrk/$(TARGET) ../lib ../targetutil:
+../libwrk/$(TARGET) ../lib ../targetutil:
 	@$(call MKDIR,$@)
 
 $(TARGET): $(EXTRA_OBJS) ../lib/$(TARGET).lib