rename a few things from mbgl => mapboxgl

6 files changed, 36 insertions, 36 deletions

diff --git a/Makefile b/Makefile
index 15566dd9a9..bfb550affc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ config.gypi:
 	./setup-libraries.sh
 
 # Builds the regular library
-mbgl: config.gypi mbgl.gyp node
-	deps/run_gyp mbgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
-	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-x86
+mbgl: config.gypi mapboxgl.gyp node
+	deps/run_gyp mapboxgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
+	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mapboxgl
 
 node:
 	@if [ ! `which node` ]; then echo 'error: depends on node.js. please make sure node is on your PATH'; exit 1; fi;
@@ -40,8 +40,8 @@ xtest: config.gypi clear_xcode_cache node
 
 
 # Builds the linux app with make. This is also used by Travis CI
-linux: config.gypi linux/mbgl-app.gyp node
-	deps/run_gyp linux/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
+linux: config.gypi linux/mapboxgl-app.gyp node
+	deps/run_gyp linux/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
 	$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
 
 # Executes the Linux binary
@@ -51,8 +51,8 @@ run-linux: linux
 
 
 # Builds the OS X app with make.
-osx: config.gypi macosx/mbgl-app.gyp node
-	deps/run_gyp macosx/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
+osx: config.gypi macosx/mapboxgl-app.gyp node
+	deps/run_gyp macosx/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
 	$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
 
 # Executes the OS X binary
@@ -65,27 +65,27 @@ clear_xcode_cache:
     @CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
     if [[ $$CUSTOM_DD ]]; then \
         echo clearing files in $$CUSTOM_DD older than one day; \
-        find $$CUSTOM_DD/mbgl-app-* -mtime +1 | xargs rm -rf; \
+        find $$CUSTOM_DD/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
     fi; \
     if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
-        echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mbgl-app-* older than one day'; \
-        find ~/Library/Developer/Xcode/DerivedData/mbgl-app-* -mtime +1 | xargs rm -rf; \
+        echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* older than one day'; \
+        find ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
     fi
 
 # build Mac OS X project for Xcode
-xproj: config.gypi macosx/mbgl-app.gyp clear_xcode_cache node
-	deps/run_gyp macosx/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/macosx/mbgl-app.xcodeproj
+xproj: config.gypi macosx/mapboxgl-app.gyp clear_xcode_cache node
+	deps/run_gyp macosx/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/macosx/mapboxgl-app.xcodeproj
 
 # build iOS project for Xcode
-iproj: config.gypi ios/mapbox-gl-cocoa/app/mbgl-app.gyp clear_xcode_cache node
-	deps/run_gyp ios/mapbox-gl-cocoa/app/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/ios/mapbox-gl-cocoa/app/mbgl-app.xcodeproj
+iproj: config.gypi ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache node
+	deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
 
 # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
-lproj: config.gypi linux/mbgl-app.gyp clear_xcode_cache node
-	deps/run_gyp linux/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/linux/mbgl-app.xcodeproj
+lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache node
+	deps/run_gyp linux/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/linux/mapboxgl-app.xcodeproj
 
 
 ##### Maintenace operations ####################################################
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
-Subproject 8a29646fd287471092b7aba9d7b524ac48423a6
+Subproject 6d29b1a2be6cf29e84349605a42140c038d80c8
diff --git a/linux/mbgl-app.gyp b/linux/mapboxgl-app.gyp
index 60d33e5936..1d09b5444b 100644
--- a/linux/mbgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -52,9 +52,9 @@
         }],
       ],
       'dependencies': [
-        '../mbgl.gyp:mbgl-x86',
-        '../mbgl.gyp:copy_default_stylesheet',
-        '../mbgl.gyp:copy_certificate_bundle',
+        '../mapboxgl.gyp:mapboxgl',
+        '../mapboxgl.gyp:copy_default_stylesheet',
+        '../mapboxgl.gyp:copy_certificate_bundle',
       ],
     },
   ],
diff --git a/macosx/mbgl-app.gyp b/macosx/mapboxgl-app.gyp
index 3afb3bc1af..59dfc66470 100644
--- a/macosx/mbgl-app.gyp
+++ b/macosx/mapboxgl-app.gyp
@@ -40,7 +40,7 @@
         'CLANG_ENABLE_OBJC_ARC': 'YES'
       },
       'dependencies': [
-        '../mbgl.gyp:mbgl-x86'
+        '../mapboxgl.gyp:mapboxgl'
       ]
     }
   ]
diff --git a/mbgl.gyp b/mapboxgl.gyp
index 749ee8be35..6585dca3bc 100644
--- a/mbgl.gyp
+++ b/mapboxgl.gyp
@@ -81,8 +81,8 @@
       ]
     },
     {
-      'target_name': 'mbgl-x86',
-      'product_name': 'mbgl-x86',
+      'target_name': 'mapboxgl',
+      'product_name': 'mapboxgl',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
@@ -149,8 +149,8 @@
       }
     },
     {
-      'target_name': 'mbgl-ios',
-      'product_name': 'mbgl-ios',
+      'target_name': 'mapboxgl-ios',
+      'product_name': 'mapboxgl-ios',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
diff --git a/test/test.gyp b/test/test.gyp
index 76ac19d2b1..93260caa6b 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -71,7 +71,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -87,7 +87,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -103,7 +103,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -119,7 +119,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -135,7 +135,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -151,7 +151,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -167,7 +167,7 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86"
+            "../mapboxgl.gyp:mapboxgl"
         ]
     },
     {
@@ -188,9 +188,9 @@
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
-            "../mbgl.gyp:mbgl-x86",
+            "../mapboxgl.gyp:mapboxgl",
             "link_gl",
-            '../mbgl.gyp:copy_default_stylesheet',
+            '../mapboxgl.gyp:copy_default_stylesheet',
         ]
     },
     {