[Fedora-directory-commits] esc Makefile,1.1.1.1,1.2

Jack Magne (jmagne) fedora-directory-commits at redhat.com
Wed Sep 13 17:43:56 UTC 2006


Author: jmagne

Update of /cvs/dirsec/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12466

Modified Files:
	Makefile 
Log Message:
Cleanup unneeded code for importing NSS.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/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:43:54 -0000	1.2
@@ -19,29 +19,6 @@
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
-all:: importnss
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-# only build the card applet on Windows, and if the tools are setup
-
-ifeq ($(findstring WIN,$(OS_TARGET)),WIN)
-ifneq (,$(JAVACARD_KIT_DIR))
-ifneq (,$(JAVA_HOME))
-ifneq (,$(SLB_DIR))
-DIRS += applet
-endif
-endif
-endif
-endif
-
-# import xulrunner to get the gdk
-
-
-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




More information about the Fedora-directory-commits mailing list