[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.ldap-client:1.2 Makefile.ldap-server:1.2 ldap_recipes.mk:1.2

[Tres Seaver]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv18293

Modified Files:
	Makefile.ldap-client Makefile.ldap-server ldap_recipes.mk 
Log Message:
 - Normalize LDAP bulids.

=== NZO_SiteLayout/Makefile.ldap-client 1.1 => 1.2 ===
 #-----------------------------------------------------------------------
 
+PYTHON_CHECKOUT=src/Python-2.1.3
+
+include python_targets.mk
 include ldap_targets.mk
 
 #-----------------------------------------------------------------------
 #   Target selectors
 #
-#   Add / remove here ass appropriate.
+#   Add / remove here as appropriate.
 #-----------------------------------------------------------------------
-OPT_TARGETS=\
-${LDAP_CLIENT_OPT_TARGETS} \
+
+LDAP_SRC_TARGETS=\
+${LDAP_CLIENT_SRC_TARGETS}
 
 SRC_TARGETS=\
 ${LDAP_CLIENT_SRC_TARGETS}
 
+OPT_TARGETS=\
+${PYTHON_OPT_TARGETS} \
+${LDAP_CLIENT_OPT_TARGETS} \
+
 ROOT_TARGETS=\
 ${LDAP_CLIENT_ROOT_TARGETS}
 
 USAGE_TARGETS=\
+python_usage \
 ldap_usage \
 
 include standard_targets.mk
@@ -44,6 +53,7 @@
 #   Recipes
 #=======================================================================
 
+include python_recipes.mk
 include ldap_recipes.mk
 
 #-----------------------------------------------------------------------


=== NZO_SiteLayout/Makefile.ldap-server 1.1 => 1.2 ===
 ${LDAP_SERVER_SRC_TARGETS}
 
+LDAP_SRC_TARGETS=\
+${LDAP_SERVER_SRC_TARGETS}
+
 USAGE_TARGETS=\
 ldap_usage \
 


=== NZO_SiteLayout/ldap_recipes.mk 1.1 => 1.2 ===
 
 opt/openldap-2.0.23: src/openldap-2.0.23
-	${CD} $< && \
-         ./configure\
+	${MKDIR} $@/build
+	${CD} $@/build && ${BASE_DIR}/$</configure\
          --prefix=${BASE_DIR}/${@}\
          --bindir=${BASE_DIR}/bin\
          --sbindir=${BASE_DIR}/bin\
@@ -14,18 +14,20 @@
          --without-kerberos\
          --with-threads\
          --enable-rlookups\
-         --with-gnu-ld && \
-         ${MAKE} && \
-         ${MAKE} install
+         --with-gnu-ld
+	${CD} $@/build && ${MAKE}
+	${CD} $@/build && ${MAKE} install
 
 opt/openldap: opt/openldap-2.0.23
 	${LNSF} ${BASE_DIR}/$< ${BASE_DIR}/$@
 
-opt/python-ldap: src/python-ldap-2.0.0pre04
-	${CD} ${BASE_DIR} && ${CPR} $< ${<:src/%=opt/%} && \
-         ${LNSF} ${BASE_DIR}/${<:src/%=opt/%} ${BASE_DIR}/$@
+opt/python-ldap-2.0.0pre04: src/python-ldap-2.0.0pre04
+	${CPR} ${BASE_DIR}/$< ${BASE_DIR}/$@
 
-opt/Python2/lib/python2.1/site-packages/ldap: opt/python-ldap
+opt/python-ldap: opt/python-ldap-2.0.0pre04
+	${LNSF} ${BASE_DIR}/$< ${BASE_DIR}/$@
+
+opt/Python2/lib/python2.1/site-packages/ldap: opt/python-ldap bin/python
 	${CD} $< && ${BASE_DIR}/bin/python setup.py install
 
 ldap_usage: