[Fedora-directory-commits] esc/src/lib/NssHttpClient Makefile, 1.1, 1.1.2.1 manifest.mn, 1.2, 1.2.2.1

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554

Modified Files:
      Tag: ESC_CS_72_BRANCH
	Makefile manifest.mn 
Log Message:
Mac Universal binary.


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Makefile	12 Jun 2006 23:39:53 -0000	1.1
+++ Makefile	26 Jan 2007 01:37:14 -0000	1.1.2.1
@@ -21,11 +21,13 @@
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
 
-include manifest.mn
+
+#include manifest.mn
 
 
 include config.mk
 
+include manifest.mn
 
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
@@ -68,3 +70,11 @@
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
+
+UNIVERSAL_OFFSET=
+ifeq ($(OS_ARCH), Darwin)
+UNIVERSAL_OFFSET=i386
+XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build/$(UNIVERSAL_OFFSET)
+
+DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -arch i386 -arch ppc  -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+endif


Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- manifest.mn	27 Sep 2006 17:49:21 -0000	1.2
+++ manifest.mn	26 Jan 2007 01:37:14 -0000	1.2.2.1
@@ -17,6 +17,9 @@
 
 CORE_DEPTH	= ../../..
 
+XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build
+
+
 SYS_INC		= /usr/include
 MODULE		= httpchunked
 LIBRARY_NAME	= $(MODULE)
@@ -25,8 +28,10 @@
 ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
 endif
+
+
 MAPFILE		= $(OBJDIR)/httpchunked.def
-DEFINES		= -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
+DEFINES		= -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr
 
 CPPSRCS		= \
 		Cache.cpp \