From 80ca7eb4e4b8cc05a571d0e350a0b45cf84cf1ba Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Sun, 9 Mar 2014 00:19:57 +0100
Subject: [PATCH] Create zip file.
---
.travis.yml | 3 ++-
Makefile | 4 ++--
doc/Makefile | 7 +++++--
libsrc/Makefile | 29 +++++++++++++++++++++--------
src/Makefile | 5 ++++-
5 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1ae62cd1c..088ee69aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ language:
install:
- sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686
script:
- - make all doc
+ - make
- make -C src clean all CROSS_COMPILE=i686-w64-mingw32-
+ - make doc zip
after_success:
- make -C doc gh-pages
env:
diff --git a/Makefile b/Makefile
index 5db00e7ad..e0530e9f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-.PHONY: all mostlyclean clean install avail unavail bin lib doc
+.PHONY: all mostlyclean clean install zip avail unavail bin lib doc
.SUFFIXES:
-all mostlyclean clean install:
+all mostlyclean clean install zip:
@$(MAKE) -C src --no-print-directory $@
@$(MAKE) -C libsrc --no-print-directory $@
@$(MAKE) -C doc --no-print-directory $@
diff --git a/doc/Makefile b/doc/Makefile
index 02028e66e..207a331f3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -2,7 +2,7 @@ ifneq ($(shell echo),)
CMD_EXE = 1
endif
-.PHONY: all mostlyclean clean install doc html info gh-pages
+.PHONY: all mostlyclean clean install zip doc html info gh-pages
.SUFFIXES:
@@ -10,7 +10,7 @@ all mostlyclean install:
ifdef CMD_EXE
-clean doc:
+clean zip doc:
else # CMD_EXE
@@ -26,6 +26,9 @@ GH_PAGES = ../../gh-pages
clean:
$(RM) -r ../html ../info
+zip:
+ cd .. && zip cc65 html/*.*
+
doc: html info
html: $(addprefix ../html/,$(SGMLS:.sgml=.html) doc.css doc.png)
diff --git a/libsrc/Makefile b/libsrc/Makefile
index 4cee7838b..877a22950 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -33,7 +33,15 @@ DRVTYPES = emd \
ser \
tgi
-.PHONY: all mostlyclean clean install lib $(TARGETS)
+OUTPUTDIRS = lib \
+ $(DRVTYPES) \
+ targetutil \
+ asminc \
+ cfg \
+ include \
+ $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
+
+.PHONY: all mostlyclean clean install zip lib $(TARGETS)
.SUFFIXES:
@@ -75,23 +83,28 @@ else # CMD_EXE
INSTALL = install
-INSTALLDIRS = ../asminc ../cfg ../include \
- $(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)) \
- ../lib ../targetutil $(addprefix ../,$(DRVTYPES))
-
define INSTALL_recipe
$(if $(prefix),,$(error variable `prefix' must be set))
-$(INSTALL) -d $(subst ..,$(DESTDIR)$(datadir),$(dir))
-$(INSTALL) -m644 $(dir)/*.* $(subst ..,$(DESTDIR)$(datadir),$(dir))
+$(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
+$(INSTALL) -m644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
endef # INSTALL_recipe
install:
- $(foreach dir,$(INSTALLDIRS),$(INSTALL_recipe))
+ $(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 $@
diff --git a/src/Makefile b/src/Makefile
index 45c8f4363..17e3bc229 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,7 @@ PROGS = ar65 \
sim65 \
sp65
-.PHONY: all mostlyclean clean install avail unavail bin $(PROGS)
+.PHONY: all mostlyclean clean install zip avail unavail bin $(PROGS)
.SUFFIXES:
@@ -97,6 +97,9 @@ unavail:
endif # CMD_EXE
+zip:
+ cd .. && zip cc65 bin/*
+
define OBJS_template
$1_OBJS := $$(patsubst %.c,../wrk/%.o,$$(wildcard $1/*.c))
--
2.39.5