build: sort wildcard results for repeatable builds (#44)

This commit is contained in:
Martin Herkt 2017-03-30 19:08:30 +02:00 committed by Thomas Goyne
parent b859ddbca4
commit 3594ade719
5 changed files with 18 additions and 18 deletions

View File

@ -1,10 +1,10 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk
DATA_AUTOMATION := \ DATA_AUTOMATION := \
$(wildcard $(d)autoload/*) \ $(sort $(wildcard $(d)autoload/*)) \
$(wildcard $(d)demos/*) \ $(sort $(wildcard $(d)demos/*)) \
$(wildcard $(d)include/*.lua) \ $(sort $(wildcard $(d)include/*.lua)) \
$(wildcard $(d)include/aegisub/*) $(sort $(wildcard $(d)include/aegisub/*))
DATA_AUTOMATION_REL := $(subst $(d),,$(DATA_AUTOMATION)) DATA_AUTOMATION_REL := $(subst $(d),,$(DATA_AUTOMATION))
DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_AUTOMATION_REL)) DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_AUTOMATION_REL))

View File

@ -5,12 +5,12 @@ aegisub_OBJ := \
$(d)ass/dialogue_parser.o \ $(d)ass/dialogue_parser.o \
$(d)ass/time.o \ $(d)ass/time.o \
$(d)ass/uuencode.o \ $(d)ass/uuencode.o \
$(subst .cpp,.o,$(wildcard $(d)audio/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)audio/*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)common/cajun/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)common/cajun/*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)lua/modules/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/modules/*.cpp))) \
$(subst .c,.o,$(wildcard $(d)lua/modules/*.c)) \ $(subst .c,.o,$(sort $(wildcard $(d)lua/modules/*.c))) \
$(subst .cpp,.o,$(wildcard $(d)lua/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)unix/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)unix/*.cpp))) \
$(d)common/calltip_provider.o \ $(d)common/calltip_provider.o \
$(d)common/character_count.o \ $(d)common/character_count.o \
$(d)common/charset.o \ $(d)common/charset.o \
@ -38,7 +38,7 @@ aegisub_OBJ := \
$(d)common/ycbcr_conv.o $(d)common/ycbcr_conv.o
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
aegisub_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm)) aegisub_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
else else
aegisub_OBJ += $(d)common/dispatch.o aegisub_OBJ += $(d)common/dispatch.o
endif endif

View File

@ -1,7 +1,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
DESKTOP_SRC := $(d) DESKTOP_SRC := $(d)
ICONS = $(wildcard $(d)*.png) $(wildcard $(d)*.svg) ICONS = $(sort $(wildcard $(d)*.png)) $(sort $(wildcard $(d)*.svg))
ICONS_INSTALLED = $(DESTDIR)$(P_ICON)/hicolor/%/apps/aegisub. ICONS_INSTALLED = $(DESTDIR)$(P_ICON)/hicolor/%/apps/aegisub.
DESKTOP_FILE := $(d)aegisub.desktop DESKTOP_FILE := $(d)aegisub.desktop

View File

@ -11,10 +11,10 @@ src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND) src_INSTALLNAME := $(AEGISUB_COMMAND)
src_OBJ := \ src_OBJ := \
$(subst .cpp,.o,$(wildcard $(d)command/*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)command/*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)dialog_*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)dialog_*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)subtitle_format*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)subtitle_format*.cpp))) \
$(subst .cpp,.o,$(wildcard $(d)visual_tool*.cpp)) \ $(subst .cpp,.o,$(sort $(wildcard $(d)visual_tool*.cpp))) \
$(d)MatroskaParser.o \ $(d)MatroskaParser.o \
$(d)aegisublocale.o \ $(d)aegisublocale.o \
$(d)ass_attachment.o \ $(d)ass_attachment.o \
@ -118,7 +118,7 @@ src_OBJ := \
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
src_OBJ += $(d)font_file_lister_coretext.o src_OBJ += $(d)font_file_lister_coretext.o
src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm)) src_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
$(d)font_file_lister_coretext.o_FLAGS := -fobjc-arc $(d)font_file_lister_coretext.o_FLAGS := -fobjc-arc
else else
src_OBJ += $(d)font_file_lister_fontconfig.o src_OBJ += $(d)font_file_lister_fontconfig.o

View File

@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
luabins_OBJ := $(subst .c,.o,$(wildcard $(d)src/*.c)) luabins_OBJ := $(subst .c,.o,$(sort $(wildcard $(d)src/*.c)))
luabins_CPPFLAGS := $(CFLAGS_LUA) luabins_CPPFLAGS := $(CFLAGS_LUA)
LIB += luabins LIB += luabins