← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-07-11 01:49:28 UTC
  • mfrom: (13400.1.3 fix-js-build-paths)
  • Revision ID: launchpad@pqm.canonical.com-20110711014928-8yetj5nob2bio8uy
[r=wgrant][bug=808561] Fix path expr used to find js files during make

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
25
25
JS_BUILD := min
26
26
endif
27
27
 
 
28
JS_SOURCE_PATHS = -path './lib/lp/*/javascript/*' ! -path '*/tests/*' \
 
29
    ! -path '*/testing/*' ! -path './lib/lp/services/*' \
 
30
    ! -path './lib/lp/contrib/*'
28
31
JS_YUI := $(shell utilities/yui-deps.py $(JS_BUILD:raw=))
29
32
JS_OTHER := $(wildcard lib/canonical/launchpad/javascript/*/*.js)
30
 
JS_LP := $(shell find lib/lp/*/javascript ! -path '*/tests/*' -name '*.js' ! -name '.*.js' )
 
33
JS_LP := $(shell find $(JS_SOURCE_PATHS) -name '*.js' ! -name '.*.js' )
31
34
JS_ALL := $(JS_YUI) $(JS_OTHER) $(JS_LP)
32
35
JS_OUT := $(LP_BUILT_JS_ROOT)/launchpad.js
33
36