Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/98496cdae16a9196bff93... ...commit http://git.netsurf-browser.org/netsurf.git/commit/98496cdae16a9196bff930f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/98496cdae16a9196bff930fff... The branch, master has been updated via 98496cdae16a9196bff930fff52e198a9856e2cb (commit) from ed5076421f3c9e93f000ae7d963f8b623b8c22db (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=98496cdae16a9196bff... commit 98496cdae16a9196bff930fff52e198a9856e2cb Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; move remaining macros into separate macro makefile diff --git a/Makefile b/Makefile index 80330b5..ac38b50 100644 --- a/Makefile +++ b/Makefile @@ -300,20 +300,6 @@ S_COMMON := \ # Message targets # ---------------------------------------------------------------------------- -# Message splitting rule generation macro -# 1 = Language -define split_messages - -$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages $$(TOOLROOT)/split-messages - $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" - $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) - $$(Q)$$(RM) $$@ - $$(Q)$$(TOOLROOT)/split-messages -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$< - -CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages -MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages - -endef # generate the message file rules $(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \ @@ -364,7 +350,7 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_SETVER) $(EXETARGET) \ -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \ -short "NetSurf $(VERSION_FULL)" \ - -long "NetSurf $(VERSION_FULL) �� 2003 - 2016 The NetSurf Developers" + -long "NetSurf $(VERSION_FULL) �� 2003 - 2021 The NetSurf Developers" $(VQ)echo " MIMESET: $(EXETARGET)" $(Q)$(BEOS_MIMESET) $(EXETARGET) endif @@ -388,79 +374,6 @@ all-program: $(EXETARGET) $(POSTEXES) .SUFFIXES: DEPFILES := -# Now some macros which build the make system - -# 1 = Source file -# 2 = dep filename, no prefix -# 3 = obj filename, no prefix -define dependency_generate_c -DEPFILES += $(2) - -endef - -# 1 = Source file -# 2 = dep filename, no prefix -# 3 = obj filename, no prefix -define dependency_generate_s -DEPFILES += $(2) - -endef - -# 1 = Source file -# 2 = obj filename, no prefix -# 3 = dep filename, no prefix -ifeq ($(CC_MAJOR),2) -# simpler deps tracking for gcc2... -define compile_target_c -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " DEP: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \ - $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ - > $$(DEPROOT)/$(3) - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) - -endef -else -define compile_target_c -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \ - -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ - -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) - -endef -endif - -define compile_target_cpp -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " DEP: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \ - $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ - > $$(DEPROOT)/$(3) - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS) $$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) - -endef - -# 1 = Source file -# 2 = obj filename, no prefix -# 3 = dep filename, no prefix -define compile_target_s -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo "ASSEMBLE: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(ASFLAGS) -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ - -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) - -endef # Rules to construct dep lines for each object... $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ diff --git a/Makefile.macros b/Makefile.macros index 37a9954..d8468b4 100644 --- a/Makefile.macros +++ b/Makefile.macros @@ -27,6 +27,7 @@ define feature_enabled endif endef + # A macro that conditionaly adds flags to the build with a uniform display. # # 1: Feature name (ie, NETSURF_USE_BMP -> BMP) @@ -56,6 +57,7 @@ define feature_switch endif endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: pkg-config required modules for feature @@ -82,6 +84,7 @@ define pkg_config_find_and_add endif endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: Feature name (ie, NETSURF_USE_RSVG -> RSVG) @@ -135,3 +138,112 @@ define pkg_config_find_and_add_enabled endif endif endef + + +# Message splitting rule generation macro +# +# 1 = Language +define split_messages + +$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages $$(TOOLROOT)/split-messages + $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" + $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) + $$(Q)$$(RM) $$@ + $$(Q)$$(TOOLROOT)/split-messages -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$< + +CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages +MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages + +endef + + +# Now some macros which build the make system + +# Extend dependancy files for c source files +# +# 1 = Source file +# 2 = dep filename, no prefix +# 3 = obj filename, no prefix +define dependency_generate_c +DEPFILES += $(2) + +endef + + +# Extend dependancy files for s source files +# +# 1 = Source file +# 2 = dep filename, no prefix +# 3 = obj filename, no prefix +define dependency_generate_s +DEPFILES += $(2) + +endef + + +# Rule generator to compile c files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +ifeq ($(CC_MAJOR),2) +# simpler deps tracking for gcc2... +define compile_target_c +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " DEP: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \ + $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ + > $$(DEPROOT)/$(3) + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) + +endef +else +define compile_target_c +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \ + -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ + -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) + +endef +endif + + +# Rule generator to compile cpp files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +define compile_target_cpp +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " DEP: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \ + $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ + > $$(DEPROOT)/$(3) + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS) $$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) + +endef + + +# Rule generator to compile s files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +define compile_target_s +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo "ASSEMBLE: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(ASFLAGS) -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ + -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) + +endef ----------------------------------------------------------------------- Summary of changes: Makefile | 89 +------------------------------------------ Makefile.macros | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 88 deletions(-) diff --git a/Makefile b/Makefile index 80330b5..ac38b50 100644 --- a/Makefile +++ b/Makefile @@ -300,20 +300,6 @@ S_COMMON := \ # Message targets # ---------------------------------------------------------------------------- -# Message splitting rule generation macro -# 1 = Language -define split_messages - -$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages $$(TOOLROOT)/split-messages - $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" - $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) - $$(Q)$$(RM) $$@ - $$(Q)$$(TOOLROOT)/split-messages -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$< - -CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages -MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages - -endef # generate the message file rules $(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \ @@ -364,7 +350,7 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_SETVER) $(EXETARGET) \ -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \ -short "NetSurf $(VERSION_FULL)" \ - -long "NetSurf $(VERSION_FULL) �� 2003 - 2016 The NetSurf Developers" + -long "NetSurf $(VERSION_FULL) �� 2003 - 2021 The NetSurf Developers" $(VQ)echo " MIMESET: $(EXETARGET)" $(Q)$(BEOS_MIMESET) $(EXETARGET) endif @@ -388,79 +374,6 @@ all-program: $(EXETARGET) $(POSTEXES) .SUFFIXES: DEPFILES := -# Now some macros which build the make system - -# 1 = Source file -# 2 = dep filename, no prefix -# 3 = obj filename, no prefix -define dependency_generate_c -DEPFILES += $(2) - -endef - -# 1 = Source file -# 2 = dep filename, no prefix -# 3 = obj filename, no prefix -define dependency_generate_s -DEPFILES += $(2) - -endef - -# 1 = Source file -# 2 = obj filename, no prefix -# 3 = dep filename, no prefix -ifeq ($(CC_MAJOR),2) -# simpler deps tracking for gcc2... -define compile_target_c -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " DEP: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \ - $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ - > $$(DEPROOT)/$(3) - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) - -endef -else -define compile_target_c -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \ - -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ - -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) - -endef -endif - -define compile_target_cpp -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo " DEP: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \ - $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ - > $$(DEPROOT)/$(3) - $$(VQ)echo " COMPILE: $(1)" - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS) $$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) - -endef - -# 1 = Source file -# 2 = obj filename, no prefix -# 3 = dep filename, no prefix -define compile_target_s -$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created - $$(VQ)echo "ASSEMBLE: $(1)" - $$(Q)$$(RM) $$(DEPROOT)/$(3) - $$(Q)$$(RM) $$(OBJROOT)/$(2) - $$(Q)$$(CC) $$(ASFLAGS) -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ - -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) - -endef # Rules to construct dep lines for each object... $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ diff --git a/Makefile.macros b/Makefile.macros index 37a9954..d8468b4 100644 --- a/Makefile.macros +++ b/Makefile.macros @@ -27,6 +27,7 @@ define feature_enabled endif endef + # A macro that conditionaly adds flags to the build with a uniform display. # # 1: Feature name (ie, NETSURF_USE_BMP -> BMP) @@ -56,6 +57,7 @@ define feature_switch endif endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: pkg-config required modules for feature @@ -82,6 +84,7 @@ define pkg_config_find_and_add endif endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: Feature name (ie, NETSURF_USE_RSVG -> RSVG) @@ -135,3 +138,112 @@ define pkg_config_find_and_add_enabled endif endif endef + + +# Message splitting rule generation macro +# +# 1 = Language +define split_messages + +$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages $$(TOOLROOT)/split-messages + $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" + $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) + $$(Q)$$(RM) $$@ + $$(Q)$$(TOOLROOT)/split-messages -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$< + +CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages +MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages + +endef + + +# Now some macros which build the make system + +# Extend dependancy files for c source files +# +# 1 = Source file +# 2 = dep filename, no prefix +# 3 = obj filename, no prefix +define dependency_generate_c +DEPFILES += $(2) + +endef + + +# Extend dependancy files for s source files +# +# 1 = Source file +# 2 = dep filename, no prefix +# 3 = obj filename, no prefix +define dependency_generate_s +DEPFILES += $(2) + +endef + + +# Rule generator to compile c files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +ifeq ($(CC_MAJOR),2) +# simpler deps tracking for gcc2... +define compile_target_c +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " DEP: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \ + $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ + > $$(DEPROOT)/$(3) + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) + +endef +else +define compile_target_c +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS) $(CFLAGS_ENV) \ + -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ + -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) + +endef +endif + + +# Rule generator to compile cpp files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +define compile_target_cpp +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo " DEP: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \ + $(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \ + > $$(DEPROOT)/$(3) + $$(VQ)echo " COMPILE: $(1)" + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS) $$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1) + +endef + + +# Rule generator to compile s files +# +# 1 = Source file +# 2 = obj filename, no prefix +# 3 = dep filename, no prefix +define compile_target_s +$$(OBJROOT)/$(2): $(1) $$(OBJROOT)/created $$(DEPROOT)/created + $$(VQ)echo "ASSEMBLE: $(1)" + $$(Q)$$(RM) $$(DEPROOT)/$(3) + $$(Q)$$(RM) $$(OBJROOT)/$(2) + $$(Q)$$(CC) $$(ASFLAGS) -MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \ + -MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1) + +endef -- NetSurf Browser