BUILD_TARGET; 'make' works now; README update

diff --git a/Makefile b/Makefile
index b92bd7ef7cc6497a0901afb425aac29ed4a8c17b..80003bdf62d14a77ba9b4b798e05315b924495ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 REPO = git@github.com:andreasgal/pdf.js.git
 BUILD_DIR := build
-PDFJS_TARGET := $(BUILD_DIR)/pdf.js
+BUILD_TARGET := $(BUILD_DIR)/pdf.js
 DEFAULT_BROWSERS := resources/browser_manifests/browser_manifest.json
 DEFAULT_TESTS := test_manifest.json
 
 EXTENSION_SRC := ./extensions/firefox
 EXTENSION_NAME := pdf.js.xpi
 
+all: bundle
+
 # Let folks define custom rules for their clones.
 -include local.mk
 
@@ -45,7 +47,7 @@ test: shell-test browser-test
 # Create production output (pdf.js, and corresponding changes to web files)
 #
 production: | bundle
-       @echo "Preparing viewer-production.html..."; \
+       @echo "Preparing web/viewer-production.html"; \
        cd web; \
        sed '/PDFJSSCRIPT_REMOVE/d' viewer.html > viewer-1.tmp; \
        sed '/PDFJSSCRIPT_INCLUDE_BUILD/ r viewer-snippet.html' viewer-1.tmp > viewer-production.html; \
@@ -55,12 +57,11 @@ production: | bundle
 #
 # Bundle pdf.js
 #
-bundle:
-       @echo "Bundling source files into pdf.js..."
-       @mkdir -p $(BUILD_DIR)
+bundle: | $(BUILD_DIR)
+       @echo "Bundling source files into $(BUILD_TARGET)"
        @cd src; \
        cat $(PDF_JS_FILES) > all_files.tmp; \
-       sed '/PDFJSSCRIPT_INCLUDE_ALL/ r all_files.tmp' pdf.js > ../$(PDFJS_TARGET); \
+       sed '/PDFJSSCRIPT_INCLUDE_ALL/ r all_files.tmp' pdf.js > ../$(BUILD_TARGET); \
        rm -f *.tmp; \
        cd ..
 
@@ -139,7 +140,7 @@ lint:
 #
 GH_PAGES = $(BUILD_DIR)/gh-pages
 web: | production extension compiler pages-repo \
-       $(addprefix $(GH_PAGES)/, $(PDFJS_TARGET)) \
+       $(addprefix $(GH_PAGES)/, $(BUILD_TARGET)) \
        $(addprefix $(GH_PAGES)/, $(wildcard web/*.*)) \
        $(addprefix $(GH_PAGES)/, $(wildcard web/images/*.*)) \
        $(addprefix $(GH_PAGES)/, $(wildcard $(EXTENSION_SRC)/*.xpi))
@@ -210,7 +211,7 @@ extension: | production
        @rm -Rf $(EXTENSION_SRC)/$(CONTENT_DIR)/
        @mkdir -p $(EXTENSION_SRC)/$(CONTENT_DIR)/$(BUILD_DIR)
        @mkdir -p $(EXTENSION_SRC)/$(CONTENT_DIR)/web
-       @cp $(PDFJS_TARGET) $(EXTENSION_SRC)/$(CONTENT_DIR)/$(BUILD_DIR)
+       @cp $(BUILD_TARGET) $(EXTENSION_SRC)/$(CONTENT_DIR)/$(BUILD_DIR)
        @cp -r $(PDF_WEB_FILES) $(EXTENSION_SRC)/$(CONTENT_DIR)/web/
        @mv -f $(EXTENSION_SRC)/$(CONTENT_DIR)/web/viewer-production.html $(EXTENSION_SRC)/$(CONTENT_DIR)/web/viewer.html
 
@@ -232,5 +233,5 @@ clean:
 help:
        @echo "Read the comments in the Makefile for guidance.";
 
-.PHONY:: production watch test browser-test font-test shell-test \
+.PHONY:: production test browser-test font-test shell-test \
        shell-msg lint clean web compiler help server

diff --git a/README.md b/README.md
index 43a8108f376def2d3311bfe0a4f179c01a268b6e..42669da28e37799659df88e9d674167a7a24309e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -59,22 +59,16 @@ You can also view all the test pdf files on the right side serving
 
 In order to bundle all `src/` files into a final `pdf.js`, issue:
 
-    $ make bundle
+    $ make
 
 This will generate the file `build/pdf.js` that can be included in your final project. (WARNING: That's a large file! Consider minifying it).
 
+
 ## Learning
 
 Here are some initial pointers to help contributors get off the ground. 
 Additional resources are available in a separate section below.
 
-#### Introductory video
-
-Check out the presentation by our contributor Julian Viereck on the inner 
-workings of PDF and pdf.js:
-
-+ http://www.youtube.com/watch?v=Iv15UY-4Fg8
-
 #### Hello world
 
 For a "hello world" example, take a look at:
@@ -84,6 +78,14 @@ For a "hello world" example, take a look at:
 This example illustrates the bare minimum ingredients for integrating pdf.js
 in a custom project.
 
+#### Introductory video
+
+Check out the presentation by our contributor Julian Viereck on the inner 
+workings of PDF and pdf.js:
+
++ http://www.youtube.com/watch?v=Iv15UY-4Fg8
+
+
 
 
 ## Contributing