[Pkg-javascript-commits] [backbone] 07/14: Tidy rules: Simplify (stop prepare CDBS snippet).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository backbone.

commit c269bb3f00ea7d51351503dfd5069b55d5ed0f9e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 30 20:17:41 2016 +0200

    Tidy rules: Simplify (stop prepare CDBS snippet).
---
 debian/rules | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index 36f328a..52a7209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,10 @@ lib = $(DEB_SOURCE_PACKAGE)
 pkg-js = libjs-$(lib)
 js-stems = $(lib)
 pkg-node = node-$(lib)
+js-min = $(js-stems:%=debian/%.min.js)
+js-nodestem = $(lib)
+js-destdir = /usr/share/javascript/$(lib)
+node-destdir = /usr/lib/nodejs/$(lib)
 
 # Minimal requirement according to upstream index.html
 underscore_minver = 1.7.0~dfsg
@@ -60,26 +64,13 @@ clean::
 DEB_INSTALL_DOCS_ALL += index.html
 DEB_INSTALL_EXAMPLES_$(pkg-js) += examples/*
 
-# TODO: generalize parts below as a CDBS javascript snippet
-
-#js-basedir =
-js-dirname ?= $(lib)
-js-stems ?= $(basename $(wildcard $(js-basedir)*.js))
-js-min ?= $(js-stems:$(js-basedir)%=debian/%.min.js)
-js-destdir ?= /usr/share/javascript/$(js-dirname)
-
 DEB_DH_INSTALL_ARGS_$(pkg-node) = package.json $(node-destdir)
 DEB_DH_INSTALL_ARGS_$(pkg-js) = $(addsuffix .js,$(js-stems)) debian/*.min.js $(js-destdir)
 
 build/$(pkg-js):: $(js-min)
-$(js-min): debian/%.min.js: $(js-basedir)%.js
+$(js-min): debian/%.min.js: %.js
 	uglifyjs -o $@ $<
 clean::
 	rm -f debian/*.js
 
-# TODO: maybe generalize parts below as a CDBS node snippet
-
-js-nodestem ?= $(lib)
-node-destdir ?= /usr/lib/nodejs/$(lib)
-
 DEB_DH_LINK_$(pkg-node) = $(js-destdir)/$(js-nodestem).js $(node-destdir)/index.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git