diff options
author | 2016-01-27 20:27:30 +0100 | |
---|---|---|
committer | 2016-01-27 20:27:30 +0100 | |
commit | d649c2113d0f0747ed79046624b8fcfde4cd72df (patch) | |
tree | 8e2ce336a61e0e9e9f515f04d5d84447735ff4e0 /templates | |
parent | 6b6982bde37911fbcefa0e6299840d998d600b85 (diff) |
Removing Makefile circular dependencies.
Diffstat (limited to 'templates')
-rw-r--r-- | templates/Makefile.template | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index a4fcf66782..5c7538131e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1498,7 +1498,10 @@ else % endif - $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP) \ + $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: \ + % if lib.name != 'z': + $(ZLIB_DEP) \ + % endif % endif % if lib.language == 'c++': $(PROTOBUF_DEP)\ |