From 20debbbbbc9cde90094a7de4bcd2c616d51dccfe Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 18 Nov 2019 19:41:57 +0100
Subject: [PATCH] Remove collect_pkg_runtime from Tupfiles

---
 cores/samples/Tuprules.tup       | 18 ------------------
 runtimes/cave_story/Tuprules.tup |  1 -
 2 files changed, 19 deletions(-)

diff --git a/cores/samples/Tuprules.tup b/cores/samples/Tuprules.tup
index c8ac0ae..2aa0b67 100644
--- a/cores/samples/Tuprules.tup
+++ b/cores/samples/Tuprules.tup
@@ -14,48 +14,41 @@ ifeq ($(TARGET_NAME),testaudio_callback)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testaudio_no_callback)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testaudio_playback_wav)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),button_test)
 	CFLAGS += -Ilibretro-common/include
 	SOURCES_C += libretro.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),freebasic)
 	TARGET_NAME=
 #	: fbastest.bas |> fbc -dll %f -x %o |> libretro.so {core}
 #	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-#	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),pascal_pong)
 	TARGET_NAME=
 #	: pong.pas |> fpc -o%o %f |> libretro.so {core}
 #	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-#	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),midi_test)
 	SOURCES_C += libretro.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/midi.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),test)
@@ -63,7 +56,6 @@ ifeq ($(TARGET_NAME),test)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),cruzes)
@@ -72,14 +64,12 @@ ifeq ($(TARGET_NAME),cruzes)
 	# : obj/Carlito-Regular.ttf |> ttf2c 16 font16 %f %o |> font16.h
 	# : obj/Carlito-Regular.ttf |> ttf2c 10 font10 %f %o |> font10.h
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),advanced_tests)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testgl_compute_shaders)
@@ -92,7 +82,6 @@ ifeq ($(TARGET_NAME),testgl_compute_shaders)
 	SOURCES_C += glsym/glsym_gl.c
 
 	PKG_DEPENDS += $(GL_DEPENDS)
-	: $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testgl_ff)
@@ -100,7 +89,6 @@ ifeq ($(TARGET_NAME),testgl_ff)
 	CFLAGS +=
 	SOURCES_C += libretro_gl_ff_test.c glsym/rglgen.c glsym/glsym_gl.c
 	PKG_DEPENDS += $(GL_DEPENDS)
-	: $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testgl)
@@ -111,35 +99,30 @@ ifeq ($(TARGET_NAME),testgl)
 	SOURCES_C += glsym/glsym_gl.c
 
 	PKG_DEPENDS += $(GL_DEPENDS)
-	: $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testsw)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testsw_vram)
 	CFLAGS += -I../../libretro-common/include
 	SOURCES_C += libretro-test.c
 	PKG_DEPENDS += $(SIMPLE_DEPENDS)
-	: $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testvulkan_async_compute)
 	CFLAGS += -I../../libretro-common/include -Iinclude
 	SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c
 	PKG_DEPENDS += $(GL_DEPENDS)
-	: $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |>
 endif
 
 ifeq ($(TARGET_NAME),testvulkan)
 	CFLAGS += -I../../libretro-common/include -Iinclude
 	SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c
 	PKG_DEPENDS += $(GL_DEPENDS)
-	: $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |>
 endif
 
 ifneq ($(TARGET_NAME),)
@@ -149,6 +132,5 @@ ifneq ($(TARGET_NAME),)
 : {core} |> !collect_bin |>
 : |> !bin |>
 
-: README.md |> !collect_pkg |>
 
 endif
diff --git a/runtimes/cave_story/Tuprules.tup b/runtimes/cave_story/Tuprules.tup
index 61ca6da..a591393 100644
--- a/runtimes/cave_story/Tuprules.tup
+++ b/runtimes/cave_story/Tuprules.tup
@@ -4,5 +4,4 @@ PKG_DEPENDS += \
 	_/src/nxengine \
 	_/src/retro_frontend \
 
-: ../runtime |> !collect_pkg_runtime |>
 : |> !pkg |>