the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samples zip and install targets moved into samples/Makefile as agreed

Browse Source
This commit is contained in:
Patrycjusz R. Łogiewa
2016-05-30 17:42:01 +02:00
parent e36a636eee
commit 4dcfc036c8
3 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -3,21 +3,22 @@
.SUFFIXES: .SUFFIXES:
all mostlyclean clean install zip: all mostlyclean clean install zip:
@$(MAKE) -C src --no-print-directory $@ @$(MAKE) -C src --no-print-directory $@
@$(MAKE) -C libsrc --no-print-directory $@ @$(MAKE) -C libsrc --no-print-directory $@
@$(MAKE) -C doc --no-print-directory $@ @$(MAKE) -C doc --no-print-directory $@
@$(MAKE) -C samples --no-print-directory $@
avail unavail bin: avail unavail bin:
@$(MAKE) -C src --no-print-directory $@ @$(MAKE) -C src --no-print-directory $@
lib: lib:
@$(MAKE) -C libsrc --no-print-directory $@ @$(MAKE) -C libsrc --no-print-directory $@
doc: doc:
@$(MAKE) -C doc --no-print-directory $@ @$(MAKE) -C doc --no-print-directory $@
%65: %65:
@$(MAKE) -C src --no-print-directory $@ @$(MAKE) -C src --no-print-directory $@
%: %:
@$(MAKE) -C libsrc --no-print-directory $@ @$(MAKE) -C libsrc --no-print-directory $@

1
libsrc/Makefile
View File

@@ -42,7 +42,6 @@ OUTPUTDIRS := lib \
asminc \ asminc \
cfg \ cfg \
include \ include \
samples \
$(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))\ $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))\
$(subst ../,,$(wildcard ../target/*/drv/*))\ $(subst ../,,$(wildcard ../target/*/drv/*))\
$(subst ../,,$(wildcard ../target/*/util))\ $(subst ../,,$(wildcard ../target/*/util))\

49
samples/Makefile
View File

@@ -12,20 +12,19 @@ SYS = c64
# source tree; otherwise, use the "install" directories. # source tree; otherwise, use the "install" directories.
ifeq "$(wildcard ../src)" "" ifeq "$(wildcard ../src)" ""
# No source tree # No source tree
MOUS = /usr/lib/cc65/target/$(SYS)/drv/mou/$(SYS)*.mou installdir = /usr/lib/cc65
TGI = /usr/lib/cc65/target/$(SYS)/drv/tgi/$(SYS)*.tgi
ifneq "$(wildcard /usr/local/lib/cc65)" "" ifneq "$(wildcard /usr/local/lib/cc65)" ""
MOUS = /usr/local/lib/cc65/target/$(SYS)/drv/mou/$(SYS)*.mou installdir = /usr/local/lib/cc65
TGI = /usr/local/lib/cc65/target/$(SYS)/drv/tgi/$(SYS)*.tgi
endif endif
ifneq "$(wildcard /opt/local/share/cc65)" "" ifneq "$(wildcard /opt/local/share/cc65)" ""
MOUS = /opt/local/share/cc65/target/$(SYS)/drv/mou/$(SYS)*.mou installdir = /opt/local/share/cc65
TGI = /opt/local/share/cc65/target/$(SYS)/drv/tgi/$(SYS)*.tgi
endif endif
ifdef CC65_HOME ifdef CC65_HOME
MOUS = $(CC65_HOME)/target/$(SYS)/drv/mou/$(SYS)*.mou installdir = $(CC65_HOME)
TGI = $(CC65_HOME)/target/$(SYS)/drv/tgi/$(SYS)*.tgi
endif endif
MOUS = $(installdir)/target/$(SYS)/drv/mou/$(SYS)*.mou
TGI = $(installdir)/target/$(SYS)/drv/tgi/$(SYS)*.tgi
CLIB = --lib $(SYS).lib CLIB = --lib $(SYS).lib
CL = cl65 CL = cl65
CC = cc65 CC = cc65
@@ -109,8 +108,11 @@ EXELIST = ascii \
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Rules to make the binaries # Rules to make the binaries
.PHONY: all .PHONY: all samples
all: $(EXELIST) all:
samples:
$(EXELIST)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Overlay rules. Overlays need special ld65 configuration files. Also, the # Overlay rules. Overlays need special ld65 configuration files. Also, the
@@ -138,9 +140,36 @@ samples.d64: all
$(C1541) -attach $@ -write $$mod > /dev/null || exit $$?;\ $(C1541) -attach $@ -write $$mod > /dev/null || exit $$?;\
done done
# --------------------------------------------------------------------------
# Installation rules
INSTALL = install
samplesdir = $(prefix)/share/cc65
.PHONY: install
install:
$(if $(prefix),,$(error variable `prefix' must be set))
$(INSTALL) -d $(DESTDIR)$(samplesdir)
$(INSTALL) -d $(DESTDIR)$(samplesdir)/geos
$(INSTALL) -d $$(DESTDIR)$(samplesdir)/tutorial
$(INSTALL) -m0644 *.* $(DESTDIR)$(samplesdir)
$(INSTALL) -m0644 README $(DESTDIR)$(samplesdir)
$(INSTALL) -m0644 Makefile $(DESTDIR)$(samplesdir)
$(INSTALL) -m0644 geos/*.* $(DESTDIR)$(samplesdir)/geos
$(INSTALL) -m0644 tutorial/*.* $(DESTDIR)$(samplesdir)/tutorial
# --------------------------------------------------------------------------
# Packaging rules
.PHONY: zip
zip:
@cd .. && zip -r cc65 samples/
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Clean-up rules # Clean-up rules
.PHONY: mostlyclean
mostlyclean:
.PHONY: clean .PHONY: clean
clean: clean:
$(RM) *~ *.map *.o *.s *.lbl $(RM) *~ *.map *.o *.s *.lbl