Kill config.mk (fixes #456)

This commit is contained in:
John Firebaugh
2014-09-03 14:07:10 -07:00
parent 3eb05efde2
commit a634605176
3 changed files with 0 additions and 14 deletions

1
.gitignore vendored
View File

@@ -8,7 +8,6 @@
/macosx/build
/ios/build
/config.gypi
/config.mk
/config/constants_local.cpp
/build
/bin/node_modules

View File

@@ -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/

9
configure vendored
View File

@@ -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)