Skip to content

Commit 75dac0c

Browse files
committed
refactor: simplify Makefile.am by removing conditional Emscripten logic for icon files and ensuring all icons are included
1 parent aa54f48 commit 75dac0c

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

data/Makefile.am

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,26 @@ EXTRA_DIST= \
1414
wadfile.png \
1515
convert-icon
1616

17-
# For Emscripten builds, skip hexen.png and strife.png if they don't exist
18-
@ENABLE_EMSCRIPTEN_TRUE@iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
19-
@ENABLE_EMSCRIPTEN_TRUE@icons_DATA = @[email protected] \
20-
@ENABLE_EMSCRIPTEN_TRUE@ @[email protected] \
21-
@ENABLE_EMSCRIPTEN_TRUE@ @[email protected]
22-
@ENABLE_EMSCRIPTEN_FALSE@iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
23-
@ENABLE_EMSCRIPTEN_FALSE@icons_DATA = @[email protected] \
24-
@ENABLE_EMSCRIPTEN_FALSE@ @[email protected] \
25-
@ENABLE_EMSCRIPTEN_FALSE@ @[email protected] \
26-
@ENABLE_EMSCRIPTEN_FALSE@ @[email protected] \
27-
@ENABLE_EMSCRIPTEN_FALSE@ @[email protected]
17+
iconsdir = $(prefix)/share/icons/hicolor/128x128/apps
18+
icons_DATA = @[email protected] \
19+
20+
21+
22+
2823

2924
@[email protected] : doom.png
3025
cp $(top_srcdir)/data/doom.png $@
3126

3227
@[email protected] : heretic.png
3328
cp $(top_srcdir)/data/heretic.png $@
3429

35-
@ENABLE_EMSCRIPTEN_FALSE@@[email protected] : hexen.png
36-
@ENABLE_EMSCRIPTEN_FALSE@ cp $(top_srcdir)/data/hexen.png $@
30+
@[email protected] : hexen.png
31+
cp $(top_srcdir)/data/hexen.png $@
3732

3833
@[email protected] : setup.png
3934
cp $(top_srcdir)/data/setup.png $@
4035

41-
@ENABLE_EMSCRIPTEN_FALSE@@[email protected] : strife.png
42-
@ENABLE_EMSCRIPTEN_FALSE@ cp $(top_srcdir)/data/strife.png $@
36+
@[email protected] : strife.png
37+
cp $(top_srcdir)/data/strife.png $@
4338

4439
CLEANFILES = $(icons_DATA)

0 commit comments

Comments
 (0)