From d7c6ce19a9e27e8771dd2a53fe2711ab8c41543b Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 24 Sep 2012 15:06:54 +0200
Subject: [PATCH] Rename build/ol-compiled.js to build/ol.js

---
 .gitignore    | 2 +-
 Makefile      | 8 ++++----
 build/ol.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4900ef2699..6a9d7a05dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /bin/plovr*.jar
 /build/ol.js
-/build/ol-compiled.js
+/build/ol-all.js
 /build/proj4js-combined.js
 /build/apidoc
 /demos/*/advanced-optimizations.*
diff --git a/Makefile b/Makefile
index 60967b27f0..eb2939b317 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,15 @@ space := $(empty) $(empty)
 all: build demos
 
 .PHONY: build
-build: build/ol-compiled.js
+build: build/ol.js
 
-build/ol-compiled.js: $(PLOVR_JAR) $(SRC) base.json \
-	build/ol.json build/ol.js
+build/ol.js: $(PLOVR_JAR) $(SRC) base.json \
+	build/ol.json build/ol-all.js
 	java -jar $(PLOVR_JAR) build build/ol.json >$@
 	@echo $@ "uncompressed:" $$(wc -c <$@) bytes
 	@echo $@ "  compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
 
-build/ol.js: $(SRC)
+build/ol-all.js: $(SRC)
 	( echo "goog.require('goog.dom');" ; find src/ol -name \*.js | xargs grep -rh ^goog.provide | sort | uniq | sed -e 's/provide/require/g' ) > $@
 
 .PHONY: demos
diff --git a/build/ol.json b/build/ol.json
index 35b09d3a5c..c1521b7bed 100644
--- a/build/ol.json
+++ b/build/ol.json
@@ -4,7 +4,7 @@
 
   "inherits": "../base.json",
 
-  "inputs": "build/ol.js",
+  "inputs": "build/ol-all.js",
 
   "output-wrapper": "(function(){%output%})();"