From a1d275b9ba7e9dcfaf2a346a77966ab14a8d4e51 Mon Sep 17 00:00:00 2001 From: Allanis Date: Tue, 31 Dec 2013 07:33:25 +0000 Subject: [PATCH] [Change] Merged some wildcard expressions. --- bin/Makefile | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index ad32b58..86abbe6 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -67,22 +67,21 @@ LDFLAGS += -pg endif # DATA. -DATA_AI := $(wildcard ../scripts/ai/*.lua) \ - $(wildcard ../scripts/ai/include/*.lua) \ - $(wildcard ../scipts/ai/tpl/*.lua) -DATA_GFX := $(wildcard ../gfx/*.png) \ - $(wildcard ../gfx/gui/*.png) \ - $(wildcard ../gfx/logo/*.png) \ - $(wildcard ../gfx/outfit/space/*.png) \ - $(wildcard ../gfx/outfit/store/*.png) \ - $(wildcard ../gfx/planet/exterior/*.png) \ - $(wildcard ../gfx/planet/space/*.png) \ - $(wildcard ../gfx/ship/*.png) \ - $(wildcard ../gfx/spfx/*.png) -DATA_XML := $(wildcard ../dat/*.xml) $(wildcard ../dat/*.ttf) -DATA_SND := $(wildcard ../snd/music/*.ogg) \ - $(wildcard ../snd/sounds/*.wav) \ - ../snd/music.lua +DATA_AI := $(wildcard ../scripts/ai/*.lua \ + ../scripts/ai/include/*.lua \ + ../scipts/ai/tpl/*.lua) +DATA_GFX := $(wildcard ../gfx/*.png \ + ../gfx/gui/*.png \ + ../gfx/logo/*.png \ + ../gfx/outfit/space/*.png \ + ../gfx/outfit/store/*.png \ + ../gfx/planet/exterior/*.png \ + ../gfx/planet/space/*.png \ + ../gfx/ship/*.png \ + ../gfx/spfx/*.png) +DATA_XML := $(wildcard ../dat/*.xml ../dat/*.ttf) +DATA_SND := $(wildcard ../snd/music/*.ogg \ + ../snd/sounds/*.wav) ../snd/music.lua DATA_MISN := $(wildcard ../dat/missions/*.lua) DATA := data DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN)