From efa50b0258ad32087a18c86b2b48dfd0346b69da Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Sun, 9 Mar 2014 13:56:32 +0100
Subject: [PATCH] Several minor adjustments.
---
.travis.yml | 2 +-
Makefile.gh-pages | 4 ++--
libsrc/Makefile | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3a9583e94..e2f64a7b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ install:
- sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686
script:
- make
- - make -C src clean all CROSS_COMPILE=i686-w64-mingw32-
+ - make -C src clean bin CROSS_COMPILE=i686-w64-mingw32-
- make doc zip
after_success:
- make -f Makefile.gh-pages
diff --git a/Makefile.gh-pages b/Makefile.gh-pages
index 573edfe9b..872232666 100644
--- a/Makefile.gh-pages
+++ b/Makefile.gh-pages
@@ -5,7 +5,7 @@
GH_PAGES = ../gh-pages
all:
- date +%D | zip -z cc65
+ date +%F | zip -z cc65
ifdef GH_TOKEN
git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/oliverschmidt/cc65.git $(GH_PAGES)
cd $(GH_PAGES) && git config user.name "Oliver Schmidt"
@@ -14,7 +14,7 @@ ifdef GH_TOKEN
cd $(GH_PAGES) && $(RM) -r doc download
cd $(GH_PAGES) && mkdir doc download
cp html/*.* $(GH_PAGES)/doc
- cp cc65.zip $(GH_PAGES)/download/cc65-snapshot.zip
+ cp cc65.zip $(GH_PAGES)/download/cc65-snapshot-win32.zip
cd $(GH_PAGES) && git add -A doc download
cd $(GH_PAGES) && git commit -m "Updated from commit $(TRAVIS_COMMIT)."
cd $(GH_PAGES) && git push
diff --git a/libsrc/Makefile b/libsrc/Makefile
index 3a355b954..86eb80b7c 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -33,13 +33,13 @@ DRVTYPES = emd \
ser \
tgi
-OUTPUTDIRS = lib \
- $(DRVTYPES) \
- targetutil \
- asminc \
- cfg \
- include \
- $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
+OUTPUTDIRS := lib \
+ $(DRVTYPES) \
+ targetutil \
+ asminc \
+ cfg \
+ include \
+ $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))
.PHONY: all mostlyclean clean install zip lib $(TARGETS)
--
2.39.5