Skip to content

Commit d9ff961

Browse files
committed
Cleaned up spacing in Makefile.
1 parent 88c33c4 commit d9ff961

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

Makefile

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#
22
# Useful targets:
3-
# - all - build everything
4-
# - iOS - build everything for iOS
5-
# - tvOS - build everything for tvOS
6-
# - watchOS - build everything for watchOS
7-
# - OpenSSL.framework-iOS - build OpenSSL.framework for iOS
8-
# - OpenSSL.framework-tvOS - build OpenSSL.framework for tvOS
9-
# - OpenSSL.framework-watchOS - build OpenSSL.framework for watchOS
10-
# - BZip2-iOS - build BZip2 library for iOS
11-
# - BZip2-tvOS - build BZip2 library for tvOS
12-
# - BZip2-watchOS - build BZip2 library for watchOS
13-
# - XZ-iOS - build XZ library for iOS
14-
# - XZ-tvOS - build XZ library for tvOS
15-
# - XZ-watchOS - build XZ library for watchOS
16-
# - Python.framework-iOS - build Python.framework for iOS
17-
# - Python.framework-tvOS - build Python.framework for tvOS
18-
# - Python.framework-watchOS - build Python.framework for watchOS
19-
# - Python-host - build host python
3+
# - all - build everything
4+
# - iOS - build everything for iOS
5+
# - tvOS - build everything for tvOS
6+
# - watchOS - build everything for watchOS
7+
# - OpenSSL.framework-iOS - build OpenSSL.framework for iOS
8+
# - OpenSSL.framework-tvOS - build OpenSSL.framework for tvOS
9+
# - OpenSSL.framework-watchOS - build OpenSSL.framework for watchOS
10+
# - BZip2-iOS - build BZip2 library for iOS
11+
# - BZip2-tvOS - build BZip2 library for tvOS
12+
# - BZip2-watchOS - build BZip2 library for watchOS
13+
# - XZ-iOS - build XZ library for iOS
14+
# - XZ-tvOS - build XZ library for tvOS
15+
# - XZ-watchOS - build XZ library for watchOS
16+
# - Python.framework-iOS - build Python.framework for iOS
17+
# - Python.framework-tvOS - build Python.framework for tvOS
18+
# - Python.framework-watchOS - build Python.framework for watchOS
19+
# - Python-host - build host python
2020

2121
# Current director
2222
PROJECT_DIR=$(shell pwd)
@@ -41,21 +41,21 @@ OS= iOS tvOS watchOS
4141
# iOS targets
4242
TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.i386 iphoneos.armv7 iphoneos.armv7s iphoneos.arm64
4343
CFLAGS-iOS=-miphoneos-version-min=7.0
44-
CFLAGS-iphoneos.armv7= -fembed-bitcode
44+
CFLAGS-iphoneos.armv7= -fembed-bitcode
4545
CFLAGS-iphoneos.armv7s= -fembed-bitcode
46-
CFLAGS-iphoneos.arm64= -fembed-bitcode
46+
CFLAGS-iphoneos.arm64= -fembed-bitcode
4747

4848
# tvOS targets
4949
TARGETS-tvOS=appletvsimulator.x86_64 appletvos.arm64
5050
CFLAGS-tvOS=-mtvos-version-min=9.0
5151
CFLAGS-appletvos.arm64= -fembed-bitcode
52-
PYTHON_CONFIGURE-tvOS= ac_cv_func_sigaltstack=no
52+
PYTHON_CONFIGURE-tvOS= ac_cv_func_sigaltstack=no
5353

5454
# watchOS targets
5555
TARGETS-watchOS=watchsimulator.i386 watchos.armv7k
5656
CFLAGS-watchOS=-mwatchos-version-min=2.0
57-
CFLAGS-watchos.armv7k= -fembed-bitcode
58-
PYTHON_CONFIGURE-watchOS=ac_cv_func_sigaltstack=no
57+
CFLAGS-watchos.armv7k= -fembed-bitcode
58+
PYTHON_CONFIGURE-watchOS= ac_cv_func_sigaltstack=no
5959

6060
# override machine types for arm64
6161
MACHINE_DETAILED-arm64=aarch64
@@ -173,16 +173,16 @@ MACHINE_SIMPLE-$1= $$(ARCH-$1)
173173
endif
174174
SDK-$1= $$(basename $1)
175175

176-
SDK_ROOT-$1= $$(shell xcrun --sdk $$(SDK-$1) --show-sdk-path)
177-
CC-$1= xcrun --sdk $$(SDK-$1) clang\
176+
SDK_ROOT-$1=$$(shell xcrun --sdk $$(SDK-$1) --show-sdk-path)
177+
CC-$1=xcrun --sdk $$(SDK-$1) clang\
178178
-arch $$(ARCH-$1) --sysroot=$$(SDK_ROOT-$1) $$(CFLAGS-$2) $$(CFLAGS-$1)
179-
LDFLAGS-$1= -arch $$(ARCH-$1) -isysroot=$$(SDK_ROOT-$1)
179+
LDFLAGS-$1=-arch $$(ARCH-$1) -isysroot=$$(SDK_ROOT-$1)
180180

181-
OPENSSL_DIR-$1= build/$2/openssl-$(OPENSSL_VERSION)-$1
182-
BZIP2_DIR-$1= build/$2/bzip2-$(BZIP2_VERSION)-$1
183-
XZ_DIR-$1= build/$2/xz-$(XZ_VERSION)-$1
184-
PYTHON_DIR-$1= build/$2/Python-$(PYTHON_VERSION)-$1
185-
pyconfig.h-$1= pyconfig-$$(ARCH-$1).h
181+
OPENSSL_DIR-$1=build/$2/openssl-$(OPENSSL_VERSION)-$1
182+
BZIP2_DIR-$1=build/$2/bzip2-$(BZIP2_VERSION)-$1
183+
XZ_DIR-$1=build/$2/xz-$(XZ_VERSION)-$1
184+
PYTHON_DIR-$1=build/$2/Python-$(PYTHON_VERSION)-$1
185+
pyconfig.h-$1=pyconfig-$$(ARCH-$1).h
186186

187187
# Unpack OpenSSL
188188
$$(OPENSSL_DIR-$1)/Makefile: downloads/openssl-$(OPENSSL_VERSION).tgz
@@ -297,11 +297,11 @@ endef
297297
define build
298298
$$(foreach target,$$(TARGETS-$1),$$(eval $$(call build-target,$$(target),$1)))
299299

300-
OPENSSL_FRAMEWORK-$1= build/$1/OpenSSL.framework
301-
BZIP2_LIB-$1= build/$1/bzip2/lib/libbz2.a
302-
XZ_LIB-$1= build/$1/xz/lib/liblzma.a
303-
PYTHON_FRAMEWORK-$1= build/$1/Python.framework
304-
PYTHON_RESOURCES-$1= $$(PYTHON_FRAMEWORK-$1)/Versions/$(PYTHON_VER)/Resources
300+
OPENSSL_FRAMEWORK-$1=build/$1/OpenSSL.framework
301+
BZIP2_LIB-$1=build/$1/bzip2/lib/libbz2.a
302+
XZ_LIB-$1=build/$1/xz/lib/liblzma.a
303+
PYTHON_FRAMEWORK-$1=build/$1/Python.framework
304+
PYTHON_RESOURCES-$1=$$(PYTHON_FRAMEWORK-$1)/Versions/$(PYTHON_VER)/Resources
305305

306306
$1: dist/Python-$(PYTHON_VERSION)-$1-support.b$(BUILD_NUMBER).tar.gz
307307

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ This should:
6868
The build products will be in the `build` directory; the compiled frameworks
6969
will be in the `dist` directory.
7070

71-
.. _for iOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-i1S-support.b1.tar.gz
72-
.. _for tvOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-i1S-support.b1.tar.gz
73-
.. _for watchOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-i1S-support.b1.tar.gz
71+
.. _for iOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-iOS-support.b1.tar.gz
72+
.. _for tvOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-iOS-support.b1.tar.gz
73+
.. _for watchOS: https://github.com/pybee/Python-iOS-support/releases/download/3.5.1-b1/Python-3.5.1-iOS-support.b1.tar.gz
7474

7575
Acknowledgements
7676
----------------

0 commit comments

Comments
 (0)