thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "BUILD: Add $(DIST_FILES_DOCS) to targets using it"

Browse source 
This reverts commit d1e195c298.
This commit is contained in:
Thierry Crozat 2021-08-28 17:26:33 +01:00 • committed by Eugene Sandulenko
parent 163313751c
commit c92837f8f7
No known key found for this signature in database
GPG key ID: 014D387312D34F08
15 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/androidsdl/androidsdl.mk
View file

@ -1,5 +1,5 @@
# Special target to create an AndroidSDL snapshot
androidsdl: $(DIST_FILES_DOCS)
androidsdl:
$(MKDIR) release
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release

4
backends/platform/dingux/dingux.mk
View file

@ -12,7 +12,7 @@ dingux-distclean:
rm -rf $(bundle_name)
rm $(DINGUX_EXE_STRIPPED)
dingux-dist: all $(DIST_FILES_DOCS)
dingux-dist: all
$(MKDIR) $(bundle_name)
$(MKDIR) $(bundle_name)/saves
$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm.elf
@ -37,7 +37,7 @@ endif
$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
# Special target for generationg GCW-Zero OPK bundle
$(gcw0_bundle): all $(DIST_FILES_DOCS)
$(gcw0_bundle): all
$(MKDIR) $(gcw0_bundle)
$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
$(MKDIR) $(gcw0_bundle)/themes

4
backends/platform/gph/caanoo-bundle.mk
View file

@ -5,7 +5,7 @@ bundle_name = release/scummvm-caanoo
f=$(shell which $(STRIP))
libloc = $(shell dirname $(f))
caanoo-bundle: $(EXECUTABLE) $(DIST_FILES_DOCS)
caanoo-bundle: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/saves"
@ -43,7 +43,7 @@ endif
tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
rm -R ./$(bundle_name)
caanoo-bundle-debug: $(EXECUTABLE) $(DIST_FILES_DOCS)
caanoo-bundle-debug: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/saves"

4
backends/platform/gph/gp2x-bundle.mk
View file

@ -4,7 +4,7 @@ bundle_name = release/scummvm-gp2x
f=$(shell which $(STRIP))
libloc = $(shell dirname $(f))
gp2x-bundle: $(EXECUTABLE) $(DIST_FILES_DOCS)
gp2x-bundle: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/saves"
$(MKDIR) "$(bundle_name)/engine-data"
@ -42,7 +42,7 @@ endif
tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
rm -R ./$(bundle_name)
gp2x-bundle-debug: $(EXECUTABLE) $(DIST_FILES_DOCS)
gp2x-bundle-debug: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/saves"
$(MKDIR) "$(bundle_name)/engine-data"

4
backends/platform/gph/gp2xwiz-bundle.mk
View file

@ -4,7 +4,7 @@ bundle_name = release/scummvm-gp2xwiz
f=$(shell which $(STRIP))
libloc = $(shell dirname $(f))
gp2xwiz-bundle: $(EXECUTABLE) $(DIST_FILES_DOCS)
gp2xwiz-bundle: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/saves"
@ -45,7 +45,7 @@ endif
tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
rm -R ./$(bundle_name)
gp2xwiz-bundle-debug: $(EXECUTABLE) $(DIST_FILES_DOCS)
gp2xwiz-bundle-debug: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/saves"

2
backends/platform/n64/n64.mk
View file

@ -12,7 +12,7 @@ n64-distclean:
rm -rf $(bundle_name)
rm $(N64_EXE_STRIPPED)
n64-dist: all $(DIST_FILES_DOCS)
n64-dist: all
$(MKDIR) $(bundle_name)
$(MKDIR) $(bundle_name)/romfs
ifdef DIST_FILES_ENGINEDATA

4
backends/platform/openpandora/op-bundle.mk
View file

@ -5,7 +5,7 @@ bundle_name = release/scummvm-op
f=$(shell which $(STRIP))
libloc = $(shell dirname $(f))
op-bundle: $(EXECUTABLE) $(DIST_FILES_DOCS)
op-bundle: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/bin"
@ -49,7 +49,7 @@ endif
tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
rm -R ./$(bundle_name)
op-pnd: $(EXECUTABLE) $(DIST_FILES_DOCS)
op-pnd: $(EXECUTABLE)
$(MKDIR) "$(bundle_name)"
$(MKDIR) "$(bundle_name)/scummvm"
$(MKDIR) "$(bundle_name)/scummvm/bin"

2
backends/platform/sdl/amigaos/amigaos.mk
View file

@ -8,7 +8,7 @@
# missing theme files and a missing valid translation.dat.
# Switching to AmigaOS' own "makedir" until there is a fix or other solution.
#
amigaosdist: $(EXECUTABLE) $(PLUGINS) $(DIST_FILES_DOCS)
amigaosdist: $(EXECUTABLE) $(PLUGINS)
makedir all $(AMIGAOSPATH)
cp ${srcdir}/dists/amigaos/scummvm_drawer.info $(patsubst %/,%,$(AMIGAOSPATH)).info
cp ${srcdir}/dists/amigaos/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info

2
backends/platform/sdl/morphos/morphos.mk
View file

@ -1,6 +1,6 @@
# Special target to create an MorphOS snapshot installation.
# AmigaOS shell doesn't like indented comments.
morphosdist: $(EXECUTABLE) $(PLUGINS) $(DIST_FILES_DOCS)
morphosdist: $(EXECUTABLE) $(PLUGINS)
mkdir -p $(MORPHOSPATH)extras
cp ${srcdir}/dists/amiga/scummvm.info $(MORPHOSPATH)/$(EXECUTABLE).info
ifdef DIST_FILES_DOCS

2
backends/platform/sdl/ps3/ps3.mk
View file

@ -1,4 +1,4 @@
ps3pkg: $(EXECUTABLE) $(DIST_FILES_DOCS)
ps3pkg: $(EXECUTABLE)
$(STRIP) $(EXECUTABLE)
sprxlinker $(EXECUTABLE)
mkdir -p ps3pkg/USRDIR/data/

2
backends/platform/sdl/psp2/psp2.mk
View file

@ -3,7 +3,7 @@ PSP2_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
$(PSP2_EXE_STRIPPED): $(EXECUTABLE)
$(STRIP) --strip-debug $< -o $@
psp2vpk: $(PSP2_EXE_STRIPPED) $(DIST_FILES_DOCS)
psp2vpk: $(PSP2_EXE_STRIPPED)
rm -rf psp2pkg
rm -f $(EXECUTABLE).vpk
mkdir -p psp2pkg/sce_sys/livearea/contents

2
backends/platform/sdl/riscos/riscos.mk
View file

@ -9,7 +9,7 @@ APP_NAME=!ScummVM
DIST_FILES_DOCS_plaintext := $(filter-out $(DIST_FILES_MANUAL),$(DIST_FILES_DOCS))
# Special target to create an RISC OS snapshot installation
riscosdist: all $(DIST_FILES_DOCS)
riscosdist: all
mkdir -p $(APP_NAME)
elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8
cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb

2
backends/platform/sdl/switch/switch.mk
View file

@ -1,4 +1,4 @@
scummvm.nro: $(EXECUTABLE) $(DIST_FILES_DOCS)
scummvm.nro: $(EXECUTABLE)
mkdir -p ./switch_release/scummvm/data
mkdir -p ./switch_release/scummvm/doc
nacptool --create "ScummVM" "Cpasjuste" "$(VERSION)" ./switch_release/scummvm.nacp

2
backends/platform/wii/wii.mk
View file

@ -23,7 +23,7 @@ wiidebug:
$(DEVKITPPC)/bin/powerpc-eabi-gdb -n $(EXECUTABLE) -x $(srcdir)/backends/platform/wii/gdb.txt
# target to create a Wii snapshot
wiidist: all $(DIST_FILES_DOCS)
wiidist: all
$(MKDIR) wiidist/scummvm
ifeq ($(GAMECUBE),1)
$(DEVKITPPC)/bin/elf2dol $(EXECUTABLE) wiidist/scummvm/scummvm.dol

12
ports.mk
View file

@ -5,7 +5,7 @@
#
# POSIX specific
#
install-data: $(DIST_FILES_DOCS)
install-data:
$(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
@ -56,7 +56,7 @@ endif
# Special generic target for simple archive distribution
dist-generic: $(EXECUTABLE) $(DIST_FILES_DOCS)
dist-generic: $(EXECUTABLE)
mkdir -p ./dist-generic/scummvm/data
mkdir -p ./dist-generic/scummvm/doc
cp $(EXECUTABLE) ./dist-generic/scummvm
@ -114,7 +114,7 @@ endif
bundle_name = ScummVM.app
bundle-pack: $(DIST_FILES_DOCS)
bundle-pack:
mkdir -p $(bundle_name)/Contents/MacOS
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
@ -174,7 +174,7 @@ else
bundle: scummvm-static bundle-pack
endif
iphonebundle: iphone $(DIST_FILES_DOCS)
iphonebundle: iphone
mkdir -p $(bundle_name)
cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
@ -198,7 +198,7 @@ endif
cp $(srcdir)/dists/iphone/Default.png $(bundle_name)/
codesign -s - --deep --force $(bundle_name)
ios7bundle: iphone $(DIST_FILES_DOCS)
ios7bundle: iphone
mkdir -p $(bundle_name)
awk 'BEGIN {s=0}\
/<key>CFBundleIcons<\/key>/ {\
@ -481,7 +481,7 @@ iphone: $(DETECT_OBJS) $(OBJS)
# Special target to create a snapshot disk image for Mac OS X
# TODO: Replace AUTHORS by Credits.rtf
osxsnap: bundle $(DIST_FILES_DOCS)
osxsnap: bundle
mkdir ScummVM-snapshot
cp $(DIST_FILES_DOCS) ./ScummVM-snapshot/
mv ./ScummVM-snapshot/COPYING ./ScummVM-snapshot/License\ \(GPL\)