Back out changes which prevent NT from building. Need to figure something else out (sigh).

bob

5 files changed, 14 insertions, 24 deletions

diff --git a/security/nss/lib/fortcrypt/Makefile b/security/nss/lib/fortcrypt/Makefile
index 544cee532..c3454dced 100644
--- a/security/nss/lib/fortcrypt/Makefile
+++ b/security/nss/lib/fortcrypt/Makefile
@@ -85,11 +85,7 @@ endif
 $(SHARED_LIBRARY): $(CILIB) $(DIRS)
 
 cilib_name:
-ifeq ($(CILIB), $(patsubst /%,/,$(CILIB)))
-	@echo $(shell pwd)"/"$(CILIB)
-else
 	@echo $(CILIB)
-endif
 
 $(CILIB):
 	@$(MAKE_OBJDIR)
diff --git a/security/nss/lib/fortcrypt/swfort/Makefile b/security/nss/lib/fortcrypt/swfort/Makefile
index 1de57d2b7..02fd10b9b 100644
--- a/security/nss/lib/fortcrypt/swfort/Makefile
+++ b/security/nss/lib/fortcrypt/swfort/Makefile
@@ -73,10 +73,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-$(OBJDIR)/nslib.c:: swflib.c nsmap.h
+nslib.c:: swflib.c nsmap.h
 	@$(MAKE_OBJDIR)
-	rm -f $(OBJDIR)/nslib.c
-	cat nsmap.h swflib.c > $(OBJDIR)/nslib.c
+	rm -f nslib.c
+	cat nsmap.h swflib.c > nslib.c
 
 export:: private_export
 
diff --git a/security/nss/lib/fortcrypt/swfort/manifest.mn b/security/nss/lib/fortcrypt/swfort/manifest.mn
index b880dd9a0..5445af13b 100644
--- a/security/nss/lib/fortcrypt/swfort/manifest.mn
+++ b/security/nss/lib/fortcrypt/swfort/manifest.mn
@@ -39,11 +39,10 @@ LIBRARY_NAME	= swfci
 CSRCS		= swfalg.c  \
 		  swfparse.c \
 		  swflib.c   \
+		  nslib.c    \
 		  swfutl.c   \
 		  $(NULL)
 
-BUILT_CSRCS = $(OBJDIR)/nslib.c 
-
 DIRS = pkcs11
 
 
diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
index 8a682a6dc..fff915e74 100644
--- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
+++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
@@ -35,7 +35,6 @@
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
-INCLUDES += -I$(OBJDIR)
 
 
 #SWCILIB			= ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX)
@@ -126,19 +125,14 @@ endif
 
 #$(SHARED_LIBRARY): $(SWCILIB)
 
-$(OBJDIR)/maci.h: $(CP_INCLUDES)
-	@$(MAKE_OBJDIR)
-	cp $(CP_INCLUDES) $(OBJDIR)
-
-$(OBJDIR)/forsock.c: ../../forsock.c $(OBJDIR)/maci.h
-	cp ../../forsock.c $(OBJDIR)
-
-$(OBJDIR)/fortpk11.c: ../../fortpk11.c $(OBJDIR)/maci.h
-	cp ../../fortpk11.c $(OBJDIR)
+forsock.c: ../../forsock.c $(CP_INCLUDES)
+	cp ../../forsock.c $(CP_INCLUDES) .
 
-$(OBJDIR)/fmutex.c: ../../fmutex.c $(OBJDIR)/maci.h
-	cp ../../fmutex.c  $(OBJDIR)
+fortpk11.c: ../../fortpk11.c
+	cp ../../fortpk11.c .
 
+fmutex.c: ../../fmutex.c
+	cp ../../fmutex.c  .
 
 
 #
diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn
index 333ff482e..eca9b5ab3 100644
--- a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn
+++ b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn
@@ -37,12 +37,13 @@ MODULE		= security
 LIBRARY_NAME	= swft
 #LIBRARY_VERSION	= 32
 
-BUILT_CSRCS	= $(OBJDIR)/forsock.c  \
-		  $(OBJDIR)/fortpk11.c \
-		  $(OBJDIR)/fmutex.c   \
+COPIED_CSRCS	= forsock.c  \
+		  fortpk11.c \
+		  fmutex.c   \
 		  $(NULL)
 
 CSRCS		= \
+		  $(COPIED_CSRCS) \
 		  stub.c \
 		  $(NULL)