← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

Merged in Ian's branch, and updated pkg_src stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
182
182
# its jsTestDriver test harness modifications in the lazr.js and
183
183
# launchpad.js roll-up files.  They fiddle with built-in functions!
184
184
# See Bug 482340.
185
 
jsbuild_yui: bin/jsbuild
 
185
jsbuild_minify: bin/jsbuild
186
186
        ${SHHH} bin/jsbuild \
187
187
            --builddir $(LAZR_BUILT_JS_ROOT) \
188
 
            --exclude testing/ --filetype $(JS_BUILD) \
189
 
            --copy-yui-to $(LAZR_BUILT_JS_ROOT)/yui
 
188
            --exclude testing/ --filetype $(JS_BUILD)
190
189
 
191
 
$(JS_YUI) $(JS_LAZR): jsbuild_yui
 
190
$(JS_YUI) $(JS_LAZR): jsbuild_minify
192
191
 
193
192
$(JS_OUT): $(JS_ALL)
194
193
ifeq ($(JS_BUILD), min)
197
196
        cat $^ > $@
198
197
endif
199
198
 
200
 
jsbuild: $(JS_OUT)
 
199
jsbuild: $(PY) $(JS_OUT)
201
200
 
202
201
eggs:
203
202
        # Usually this is linked via link-external-sourcecode, but in
483
482
        test_build test_inplace pagetests check schema default \
484
483
        launchpad.pot pull_branches scan_branches sync_branches \
485
484
        reload-apache hosted_branches check_mailman check_config \
486
 
        jsbuild jsbuild_lazr clean_js clean_buildout buildonce_eggs \
 
485
        jsbuild jsbuild_minify clean_js clean_buildout buildonce_eggs \
487
486
        build_eggs sprite_css sprite_image css_combine compile \
488
487
        check_schema pydoctor clean_logs