[Fedora-directory-commits] esc/src Makefile, 1.1.1.1, 1.2 manifest.mn, 1.1.1.1, 1.2
Author: jmagne
Update of /cvs/dirsec/esc/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12574
Modified Files:
Makefile manifest.mn
Log Message:
Minor code cleanup.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 12 Jun 2006 23:39:49 -0000 1.1.1.1
+++ Makefile 13 Sep 2006 17:46:53 -0000 1.2
@@ -23,14 +23,25 @@
ifeq ($(OS_ARCH), WINNT)
-DIRS += mozilla app/xpcom/tray app/xpcom win32
+DIRS += xulrunner app/xpcom/tray app/xpcom win32
endif
ifeq ($(OS_ARCH), Darwin)
-DIRS += mozilla app/xpcom/tray app/xpcom mac
+DIRS += xulrunner app/xpcom/tray app/xpcom mac
endif
ifeq ($(OS_ARCH), Linux)
-DIRS += mozilla lib/docklet app/xpcom/tray app/xpcom
+DIRS += xulrunner lib/notifytray app/xpcom/tray app/xpcom
+endif
+
+
+ifneq ($(OS_ARCH),Linux)
+IMPORTS += src/xulrunner/v1.8.0.1/xulrunner-1.8.0.1-source.tar.gz
+importnss:
+ifeq ($(IMPORT_NSS),1)
+ifneq ($(wildcard
$(NSSDIR)/$(OBJDIR)/include/prtypes.h),$(NSSDIR)/$(OBJDIR)/include/prtypes.h)
+ $(MAKE) import
+endif
+endif
endif
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/manifest.mn,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- manifest.mn 12 Jun 2006 23:39:49 -0000 1.1.1.1
+++ manifest.mn 13 Sep 2006 17:46:53 -0000 1.2
@@ -15,7 +15,7 @@
# All rights reserved.
# END COPYRIGHT BLOCK
-CORE_DEPTH = ..
+CORE_DEPTH = ../
DIRS = \
lib/NssHttpClient \