Clean up unused Mac build targets. Separate dep/Makefile targets into a download step and a build step.

Makefile

@@ -163,18 +163,6 @@ endif
 	cd dist && zip -q -9 -r Rack-SDK-$(VERSION).zip Rack-SDK
 
 
-notarize:
-	# This will only work if you have my Apple ID password in your keychain
-ifdef ARCH_MAC
-	xcrun altool --notarize-app -f dist/Rack-$(VERSION)-$(ARCH).zip --primary-bundle-id=com.vcvrack.rack -u "andrewpbelt@gmail.com" -p @keychain:notarize
-	#xcrun altool --notarization-info XXXXXXXXX -u "andrewpbelt@gmail.com" -p @keychain:notarize
-endif
-
-staple:
-ifdef ARCH_MAC
-	xcrun stapler staple dist/$(TARGET).app
-endif
-
 UPLOAD_URL := vortico@vcvrack.com:files/
 upload:
 	# This will only work if you have a private key to my server
@@ -203,5 +191,5 @@ endif
 
 include compile.mk
 
-.PHONY: all dep run debug clean dist plugins cleanplugins distplugins cmdplugins
 .DEFAULT_GOAL := all
+.PHONY: all dep run debug clean dist upload src plugins

dep/Makefile

@@ -60,51 +60,66 @@ include $(RACK_DIR)/dep.mk
 
 # Targets
 
-$(glew):
+glew-2.1.0:
 	$(WGET) "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz"
 	$(SHA256) glew-2.1.0.tgz 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
 	$(UNTAR) glew-2.1.0.tgz
+	rm glew-2.1.0.tgz
+
+$(glew): glew-2.1.0
 	cd glew-2.1.0 && mkdir -p build
 	cd glew-2.1.0/build && $(CMAKE) ./cmake
 	$(MAKE) -C glew-2.1.0/build
 	$(MAKE) -C glew-2.1.0/build install
 
-$(glfw):
+$(glfw): glfw
 	cd glfw && mkdir -p build
 	cd glfw/build && $(CMAKE) .. \
 		-DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF
 	$(MAKE) -C glfw/build
 	$(MAKE) -C glfw/build install
 
-$(jansson):
+jansson-2.12:
 	$(WGET) "http://www.digip.org/jansson/releases/jansson-2.12.tar.gz"
 	$(SHA256) jansson-2.12.tar.gz 5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9
 	$(UNTAR) jansson-2.12.tar.gz
+	rm jansson-2.12.tar.gz
+
+$(jansson): jansson-2.12
 	cd jansson-2.12 && $(CONFIGURE)
 	$(MAKE) -C jansson-2.12
 	$(MAKE) -C jansson-2.12 install
 
-$(libspeexdsp):
+speexdsp-SpeexDSP-1.2rc3:
 	$(WGET) "https://vcvrack.com/downloads/dep/speexdsp-SpeexDSP-1.2rc3.tgz"
 	$(SHA256) speexdsp-SpeexDSP-1.2rc3.tgz c8dded1454747f65956f981c95e7f89a06abdaa2a53e8aeaa66bab2a3d59cebd
 	$(UNTAR) speexdsp-SpeexDSP-1.2rc3.tgz
+	rm speexdsp-SpeexDSP-1.2rc3.tgz
+
+$(libspeexdsp): speexdsp-SpeexDSP-1.2rc3
 	cd speexdsp-SpeexDSP-1.2rc3 && $(CONFIGURE)
 	$(MAKE) -C speexdsp-SpeexDSP-1.2rc3
 	$(MAKE) -C speexdsp-SpeexDSP-1.2rc3 install
 
-$(openssl):
+openssl-1.1.1b:
 	$(WGET) "https://www.openssl.org/source/openssl-1.1.1b.tar.gz"
 	$(SHA256) openssl-1.1.1b.tar.gz 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b
 	$(UNTAR) openssl-1.1.1b.tar.gz
+	rm openssl-1.1.1b.tar.gz
+
+$(openssl): openssl-1.1.1b
 	@# ./config ignores CFLAGS, so hack it in with CC
 	cd openssl-1.1.1b && CC="$(CC) $(CFLAGS)" ./config --prefix="$(DEP_PATH)"
 	$(MAKE) -C openssl-1.1.1b
 	$(MAKE) -C openssl-1.1.1b install_sw
 
-$(libcurl): $(openssl)
+curl-7.64.1:
 	$(WGET) "https://curl.haxx.se/download/curl-7.64.1.tar.gz"
 	$(SHA256) curl-7.64.1.tar.gz 432d3f466644b9416bc5b649d344116a753aeaa520c8beaf024a90cba9d3d35d
 	$(UNTAR) curl-7.64.1.tar.gz
+	rm curl-7.64.1.tar.gz
+
+$(libcurl): $(openssl) curl-7.64.1
 	cd curl-7.64.1 && PKG_CONFIG_PATH= $(CONFIGURE) \
 		--disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-shared --disable-symbol-hiding \
 		--without-zlib --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-brotli \
@@ -112,19 +127,25 @@ $(libcurl): $(openssl)
 	$(MAKE) -C curl-7.64.1
 	$(MAKE) -C curl-7.64.1 install
 
-$(libzip): $(zlib)
+libzip-1.5.2:
 	$(WGET) "https://libzip.org/download/libzip-1.5.2.tar.gz"
 	$(SHA256) libzip-1.5.2.tar.gz be694a4abb2ffe5ec02074146757c8b56084dbcebf329123c84b205417435e15
 	$(UNTAR) libzip-1.5.2.tar.gz
+	rm libzip-1.5.2.tar.gz
+
+$(libzip): $(zlib) libzip-1.5.2
 	cd libzip-1.5.2 && mkdir -p build
 	cd libzip-1.5.2/build && $(CMAKE) .. -DCMAKE_FIND_ROOT_PATH="$(DEP_PATH)" -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_BZIP2=OFF -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DBUILD_SHARED_LIBS=OFF
 	$(MAKE) -C libzip-1.5.2/build
 	$(MAKE) -C libzip-1.5.2/build install
 
-$(zlib):
+zlib-1.2.11:
 	$(WGET) "https://www.zlib.net/zlib-1.2.11.tar.gz"
 	$(SHA256) zlib-1.2.11.tar.gz c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 	$(UNTAR) zlib-1.2.11.tar.gz
+	rm zlib-1.2.11.tar.gz
+
+$(zlib): zlib-1.2.11
 ifdef ARCH_WIN
 	$(MAKE) -C zlib-1.2.11 -f win32/Makefile.gcc
 	$(MAKE) -C zlib-1.2.11 -f win32/Makefile.gcc BINARY_PATH="$(DEP_PATH)/bin" INCLUDE_PATH="$(DEP_PATH)/include" LIBRARY_PATH="$(DEP_PATH)/lib" install
@@ -135,10 +156,13 @@ else
 	$(MAKE) -C zlib-1.2.11 install
 endif
 
-$(rtmidi):
+rtmidi-4.0.0:
 	$(WGET) "http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-4.0.0.tar.gz"
 	$(SHA256) rtmidi-4.0.0.tar.gz 370cfe710f43fbeba8d2b8c8bc310f314338c519c2cf2865e2d2737b251526cd
 	$(UNTAR) rtmidi-4.0.0.tar.gz
+	rm rtmidi-4.0.0.tar.gz
+
+$(rtmidi): rtmidi-4.0.0
 	cd rtmidi-4.0.0 && $(CONFIGURE) --enable-shared=no --with-jack=no
 	$(MAKE) -C rtmidi-4.0.0
 	$(MAKE) -C rtmidi-4.0.0 install
@@ -154,7 +178,7 @@ ifdef ARCH_LIN
 RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_OSS=OFF
 endif
 
-$(rtaudio):
+$(rtaudio): rtaudio
 	cd rtaudio && mkdir -p build
 	cd rtaudio/build && $(CMAKE) $(RTAUDIO_FLAGS) ..
 	$(MAKE) -C rtaudio/build
@@ -172,12 +196,19 @@ $(oui-blendish): $(wildcard oui-blendish/*.h)
 $(osdialog): $(wildcard osdialog/*.h)
 	cp $^ include/
 
-$(pffft):
+jpommier-pffft-29e4f76ac53b:
 	$(WGET) "https://bitbucket.org/jpommier/pffft/get/29e4f76ac53b.zip"
 	$(SHA256) 29e4f76ac53b.zip bb10afba127904a0c6c553fa445082729b7d72373511bda1b12a5be0e03f318a
 	$(UNZIP) 29e4f76ac53b.zip
+	rm 29e4f76ac53b.zip
+
+$(pffft): jpommier-pffft-29e4f76ac53b
 	cp jpommier-pffft-29e4f76ac53b/*.h include/
 
+# Helpers
+
+src: glew-2.1.0 glfw jansson-2.12 speexdsp-SpeexDSP-1.2rc3 openssl-1.1.1b curl-7.64.1 libzip-1.5.2 zlib-1.2.11 rtmidi-4.0.0 rtaudio nanovg nanosvg oui-blendish osdialog jpommier-pffft-29e4f76ac53b
+
 clean:
 	git clean -fdx
 	git submodule foreach git clean -fdx