Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/3e6c0a971c48fa764cc0fd21d5ef5a559c89be96
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/3e6c0a971c48fa764cc0fd21d5ef5a559c89be96
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/3e6c0a971c48fa764cc0fd21d5ef5a559c89be96
The branch, master has been updated
via 3e6c0a971c48fa764cc0fd21d5ef5a559c89be96 (commit)
from 067a5105a76e51eebcdf7e7786d1f91040442d47 (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/buildsystem.git/commit/?id=3e6c0a971c48fa764cc0fd21d5ef5a559c89be96
commit 3e6c0a971c48fa764cc0fd21d5ef5a559c89be96
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
makefiles: move __postshared after all
all is the default target and must be the first one in the file.
The lib-shared component type violated this requirement by
declaring __postshared first. Move the __postshared target down
and declare it unconditionally (as it's safe to do so, and these
Makefiles are complex enough already).
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 2a41697..c1a8490 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -216,10 +216,6 @@ endif
ifeq ($(COMPONENT_TYPE),lib-shared)
POST_TARGETS := __postshared $(POST_TARGETS)
-
-__postshared:
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
endif
# Default target
@@ -229,6 +225,10 @@ all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
test: all $(TEST_PREREQS) $(TEST_BINARIES) $(TEST_TARGETS)
$(VQ)$(ECHO) $(ECHOFLAGS) " TEST: Testing complete"
+__postshared:
+ $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
+ $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
+
# Compute coverage
__precov: __partial_clean
$(Q)$(LCOV) --directory . --zerocounters
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.top | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 2a41697..c1a8490 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -216,10 +216,6 @@ endif
ifeq ($(COMPONENT_TYPE),lib-shared)
POST_TARGETS := __postshared $(POST_TARGETS)
-
-__postshared:
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
endif
# Default target
@@ -229,6 +225,10 @@ all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
test: all $(TEST_PREREQS) $(TEST_BINARIES) $(TEST_TARGETS)
$(VQ)$(ECHO) $(ECHOFLAGS) " TEST: Testing complete"
+__postshared:
+ $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
+ $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
+
# Compute coverage
__precov: __partial_clean
$(Q)$(LCOV) --directory . --zerocounters
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
