[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/mozilla

Modified Files:
	Makefile 
Log Message:
use given name for moz objdir naming


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	14 Feb 2006 22:29:29 -0000	1.2
+++ Makefile	16 Feb 2006 21:34:04 -0000	1.3
@@ -18,11 +18,19 @@
 
 ifndef DEBUG
 OPTFLAG="BUILD_OPT=1"
-CONFIGFLAG=--disable-debug --enable-optimize
+CONFIGURE_OPTS=--disable-debug --enable-optimize
+OBJDIR=OPT.OBJ
 else
-CONFIGFLAG=--enable-debug --disable-optimize
+CONFIGURE_OPTS=--enable-debug --disable-optimize
+OBJDIR=DBG.OBJ
 endif
 
+ifeq ($(USE_64), 1)
+CONFIGURE_OPTS += --enable-64bit
+endif
+
+NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR)
+
 # this is our "custom" patch target
 post-patch:
 ifdef MYPATCH
@@ -36,13 +44,35 @@
 	$(MAKECOOKIE)
 
 build-custom:
-	cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG)
-	cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG)
-	cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG)
+# first, build coreconf
+	$(MAKE) -C work/mozilla/security/coreconf OBJDIR_NAME=$(OBJDIR)
+
+# next, configure and make nspr
+	mkdir -p work/mozilla/dist/$(OBJDIR)
+	mkdir -p work/mozilla/nsprpub/$(OBJDIR)
+	cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \
+		--with-dist-prefix='$(NSPR_PREFIX)' \
+		--with-dist-includedir='$(NSPR_PREFIX)/include'
+
+	$(MAKE) -C work/mozilla/nsprpub/$(OBJDIR)
+
+# next, make dbm
+	$(MAKE) -C work/mozilla/security/dbm OBJDIR_NAME=$(OBJDIR) export libs
+
+# next, make nss
+	$(MAKE) -C work/mozilla/security/nss $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) all
+#	$(MAKE) -C work/mozilla/security/nss nss_build_all $(OPTFLAG)
+
+# next, make svrcore
+	cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR)
+
+# next, configure and make the ldap c sdk
+	cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGURE_OPTS)
 	cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG)
+
 # perldap uses MakeMaker, so lots of env. vars.
 	cd work/mozilla/directory/perldap && \
-	LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \
+	LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=../../dist/$(OBJDIR) perl Makefile.PL && \
 	$(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib
 	$(MAKECOOKIE)