Bug 1046468 - toolkit/library has an inter-dependency on ldap for comm-central that it needs to be told about in the moz.build world r=jcranmer for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 31 Jul 2014 15:16:26 +0100
changeset 20687 400d3f9380fb71bcea42d763cdfc1f53cfe83470
parent 20686 f200e20f0ea9739b812204a913c82751d29c0d7c
child 20688 321473e98f56c0574514296206a19e1fdf242213
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-beta@12633210f163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1046468
Bug 1046468 - toolkit/library has an inter-dependency on ldap for comm-central that it needs to be told about in the moz.build world r=jcranmer for a CLOSED TREE
ldap/Makefile.in
ldap/moz.build
--- a/ldap/Makefile.in
+++ b/ldap/Makefile.in
@@ -8,8 +8,10 @@
 
 export::
 	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/config export
 	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/ldap/include export
 
 libs clean distclean::
 	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@
 
+target::
+	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk export
--- a/ldap/moz.build
+++ b/ldap/moz.build
@@ -1,5 +1,10 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# There needs to be an ldap/target entry in root.mk for the ldap libraries to
+# be built ahead of toolkit/library, so by adding a LIBRARY_NAME, it forces an
+# entry to be created. It is not currently used for anything other than
+# creating that entry.
+LIBRARY_NAME = 'ldapsdks'