[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] GNUmakefile: combine with pkg.mk
From: |
Eric Wong |
Subject: |
[PATCH 02/10] GNUmakefile: combine with pkg.mk |
Date: |
Sun, 1 Sep 2013 01:22:02 +0000 |
We hardly use GNU make right now.
---
GNUmakefile | 21 ++++++++++++++++++++-
pkg.mk | 28 ----------------------------
2 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 pkg.mk
diff --git a/GNUmakefile b/GNUmakefile
index 5b7cf68..a1b49b2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,7 +1,23 @@
# Copyright (C) 2013, Eric Wong <address@hidden> and all contributors
# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
all::
-include pkg.mk
+
+RUBY = ruby
+GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+ @./GIT-VERSION-GEN
+-include GIT-VERSION-FILE
+lib := lib
+
+all:: test
+test_units := $(wildcard test/test_*.rb)
+test: test-unit
+test-unit: $(test_units)
+$(test_units):
+ $(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
+
+check-warnings:
+ @(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+ do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
check: test
coverage: export COVERAGE=1
@@ -9,3 +25,6 @@ coverage:
> coverage.dump
$(MAKE) check
$(RUBY) ./test/covshow.rb
+
+.PHONY: all .FORCE-GIT-VERSION-FILE test $(test_units)
+.PHONY: check-warnings
diff --git a/pkg.mk b/pkg.mk
deleted file mode 100644
index bfb303c..0000000
--- a/pkg.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2013, Eric Wong <address@hidden> and all contributors
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
- @./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["DLEXT"]')
-RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
-lib := lib
-
-all:: test
-test_units := $(wildcard test/test_*.rb)
-test: test-unit
-test-unit: $(test_units)
-$(test_units):
- $(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
-
-check-warnings:
- @(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
- do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
-
-.PHONY: all .FORCE-GIT-VERSION-FILE test $(test_units)
-.PHONY: check-warnings
--
1.8.4
- [PATCH 0/10] misc updates to master, Eric Wong, 2013/08/31
- [PATCH 02/10] GNUmakefile: combine with pkg.mk,
Eric Wong <=
- [PATCH 08/10] doc: reorganize sections around dtas-player, Eric Wong, 2013/08/31
- [PATCH 10/10] doc: add contact info to all documentation, Eric Wong, 2013/08/31
- [PATCH 09/10] doc: sink_examples: reference dtas-xdelay and friends, Eric Wong, 2013/08/31
- [PATCH 04/10] Rakefile: wrap long line, Eric Wong, 2013/08/31
- [PATCH 07/10] source/{av, ff}: probe harder for audio in weird containers, Eric Wong, 2013/08/31
- [PATCH 03/10] Rakefile: additional pointer to git-set-file-times, Eric Wong, 2013/08/31
- [PATCH 05/10] dtas-sourcedit: allow loading YAML from stdin, Eric Wong, 2013/08/31
- [PATCH 06/10] test_source_av: fix test to actually run, Eric Wong, 2013/08/31
- [PATCH 01/10] disclaimer: disambiguate between dtas/$PROGNAME, Eric Wong, 2013/08/31