Change *_rules variable type

This commit is contained in:
Emery Hemingway 2019-06-27 11:48:26 +02:00
parent 549e7df89b
commit 2841227ce2
20 changed files with 27 additions and 27 deletions

View File

@ -61,11 +61,11 @@ PKG_DIR = $(DEPOT_BIN_DIR)/$(BIN_NAME)/current
|> $(BIN_DIR)/.ARCHIVES $(DEPOT_DIR)/<bin-archives>
# Macro invoked in BIN_RULES
RAW_RULES = $(TUP_CWD)/errata/raw.tup
&RAW_RULES = errata/raw.tup
# Rules for finalizing a locally defined raw package
BIN_RULES = $(TUP_CWD)/errata/bin.tup
&BIN_RULES = errata/bin.tup
# Rules for finalizing a locally defined binary package
PKG_RULES = $(TUP_CWD)/errata/pkg.tup
&PKG_RULES = errata/pkg.tup
# Rules for finalizing a locally defined runtime package
AWK_LOCAL_ARCHIVES = awk -F '/' \

View File

@ -12,7 +12,7 @@ DOPA_FILES = \
pak0.pak \
: dopa.rar |> unrar x %f $(DOPA_FILES); tar cf %o $(DOPA_FILES); rm $(DOPA_FILES) |> $(RAW_DIR)/quake_dopa.tar
include $(RAW_RULES)
include &(RAW_RULES)
PKG_DEPENDS += \
@(PUBLIC_SRC_VFS) \
@ -23,6 +23,6 @@ PKG_DEPENDS += \
_/raw/$(RAW_NAME) \
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)
endif

View File

@ -20,6 +20,6 @@ PKG_DEPENDS += \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include &RAW_RULES)
endif

View File

@ -17,4 +17,4 @@ PKG_DEPENDS += \
_/raw/$(TARGET_NAME) \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include &(RAW_RULES)

View File

@ -17,5 +17,5 @@ PKG_DEPENDS += \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include $(PKG_RULES)
include &(RAW_RULES)
include &(PKG_RULES)

View File

@ -11,6 +11,6 @@ include_rules
RAW_VERSION = 0.38.h
: {tar} |> !collect_raw |>
include $(RAW_RULES)
include &(RAW_RULES)
endif

View File

@ -37,4 +37,4 @@ PKG_DEPENDS += \
include_rules
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -6,4 +6,4 @@ PKG_DEPENDS += \
include_rules
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -6,4 +6,4 @@ PKG_DEPENDS += \
include_rules
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -9,5 +9,5 @@ include_rules
: backdrop.png |> !collect_raw |>
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include $(PKG_RULES)
include &(RAW_RULES)
include &(PKG_RULES)

View File

@ -1,4 +1,4 @@
ifndef CONFIG_NO_NETWORK
ifndef CONFIG_OFFLINE
TARGET_NAME = cave_story-en
@ -14,6 +14,6 @@ include_rules
RAW_VERSION = 2004.12
: {tar} |> !collect_raw |>
include $(RAW_RULES)
include &(RAW_RULES)
endif

View File

@ -1,4 +1,4 @@
ifndef CONFIG_NO_NETWORK
ifndef CONFIG_OFFLINE
TARGET_NAME = soyuz
@ -22,6 +22,6 @@ include_rules
: runtime |> !collect_pkg_runtime |>
: |> !pkg |>
include $(RAW_RULES)
include &(RAW_RULES)
endif

View File

@ -12,6 +12,6 @@ CXXFLAGS += `$(PKG_CONFIG) --cflags $(PKGS)`
$(LD) `$(PKG_CONFIG) --libs $(PKGS)` %f -o %o |> %d {binary}
: {binary} |> !collect_bin |>
include $(BIN_RULES)
include &(BIN_RULES)
endif

@ -1 +1 @@
Subproject commit 49098b9af3d089ca4a367d8e12c95d7b792460df
Subproject commit a7c2ad872dd1f58377d667a37bc85893fab7bdf4

View File

@ -15,4 +15,4 @@ PKG_DEPENDS += \
: ../seoul_installer_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -12,4 +12,4 @@ PKG_DEPENDS += \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include &(RAW_RULES)

View File

@ -14,4 +14,4 @@ PKG_DEPENDS += \
: ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -16,4 +16,4 @@ PKG_DEPENDS += \
: ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime
: runtime |> !collect_pkg_runtime |>
include $(PKG_RULES)
include &(PKG_RULES)

View File

@ -18,4 +18,4 @@ PKG_DEPENDS += \
: runtime |> !collect_pkg_runtime |>
include $(RAW_RULES)
include &(RAW_RULES)

View File

@ -2,4 +2,4 @@ RAW_NAME = vbox_install_x86_64
include_rules
: machine.vbox |> !collect_raw |>
: machine.vdi |> !collect_raw |>
include $(RAW_RULES)
include &(RAW_RULES)