diff --git a/.gitignore b/.gitignore index 740653e6a..23dbb0f8f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ /macosx/build /ios/build /config.gypi -/config.mk /config/constants_local.cpp /build /bin/node_modules diff --git a/Makefile b/Makefile index c8d11b407..d5d713613 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ --include config.mk - BUILDTYPE ?= Release PYTHON ?= python V ?= 1 @@ -97,11 +95,9 @@ lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache node clean: clear_xcode_cache -find ./deps/gyp -name "*.pyc" -exec rm {} \; -rm -rf ./build/ - -rm -rf ./config.mk -rm -rf ./config.gypi distclean: clean - -rm -rf ./config.mk -rm -rf ./config.gypi -rm -rf ./mapnik-packaging/osx/out/ diff --git a/configure b/configure index a38c587d6..e8f880b54 100755 --- a/configure +++ b/configure @@ -133,12 +133,3 @@ if __name__ == '__main__': write('config.gypi', "# Do not edit. Generated by the configure script.\n" + pprint.pformat(output, indent=2) + "\n") - - config = { - 'BUILDTYPE': 'Debug' if options.debug else 'Release', - 'PYTHON': sys.executable, - } - config = '\n'.join(map('='.join, config.iteritems())) + '\n' - - write('config.mk', - '# Do not edit. Generated by the configure script.\n' + config)