diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-04-24 17:05:18 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-04-24 17:05:18 +0000 |
| commit | 98f1883cf9263ea285094c3c16e3c2a0f14af2c0 (patch) | |
| tree | e5055969a7f51864e72fb8215074a8026d926888 /security | |
| parent | 29de64bde7eff6be8366d902f53382df8ab32252 (diff) | |
| download | nss-hg-98f1883cf9263ea285094c3c16e3c2a0f14af2c0.tar.gz | |
Add client requested features to coreconf:
building cross platform.
targetting the Objects to a separate tree.
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/fortcrypt/Makefile | 3 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/Makefile | 7 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/manifest.mn | 3 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/Makefile | 18 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn | 7 |
5 files changed, 24 insertions, 14 deletions
diff --git a/security/nss/lib/fortcrypt/Makefile b/security/nss/lib/fortcrypt/Makefile index 9c047fa7f..c3454dced 100644 --- a/security/nss/lib/fortcrypt/Makefile +++ b/security/nss/lib/fortcrypt/Makefile @@ -84,6 +84,9 @@ endif $(SHARED_LIBRARY): $(CILIB) $(DIRS) +cilib_name: + @echo $(CILIB) + $(CILIB): @$(MAKE_OBJDIR) @if test -f $(ORIG_CILIB); then \ diff --git a/security/nss/lib/fortcrypt/swfort/Makefile b/security/nss/lib/fortcrypt/swfort/Makefile index 80b91c768..1de57d2b7 100644 --- a/security/nss/lib/fortcrypt/swfort/Makefile +++ b/security/nss/lib/fortcrypt/swfort/Makefile @@ -73,9 +73,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### -nslib.c:: swflib.c nsmap.h - rm -f nslib.c - cat nsmap.h swflib.c > nslib.c +$(OBJDIR)/nslib.c:: swflib.c nsmap.h + @$(MAKE_OBJDIR) + rm -f $(OBJDIR)/nslib.c + cat nsmap.h swflib.c > $(OBJDIR)/nslib.c export:: private_export diff --git a/security/nss/lib/fortcrypt/swfort/manifest.mn b/security/nss/lib/fortcrypt/swfort/manifest.mn index 5445af13b..b880dd9a0 100644 --- a/security/nss/lib/fortcrypt/swfort/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/manifest.mn @@ -39,10 +39,11 @@ 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 fff915e74..8a682a6dc 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile @@ -35,6 +35,7 @@ include manifest.mn include $(CORE_DEPTH)/coreconf/config.mk include config.mk +INCLUDES += -I$(OBJDIR) #SWCILIB = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) @@ -125,14 +126,19 @@ endif #$(SHARED_LIBRARY): $(SWCILIB) -forsock.c: ../../forsock.c $(CP_INCLUDES) - cp ../../forsock.c $(CP_INCLUDES) . +$(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) -fortpk11.c: ../../fortpk11.c - cp ../../fortpk11.c . +$(OBJDIR)/fmutex.c: ../../fmutex.c $(OBJDIR)/maci.h + cp ../../fmutex.c $(OBJDIR) -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 eca9b5ab3..333ff482e 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn @@ -37,13 +37,12 @@ MODULE = security LIBRARY_NAME = swft #LIBRARY_VERSION = 32 -COPIED_CSRCS = forsock.c \ - fortpk11.c \ - fmutex.c \ +BUILT_CSRCS = $(OBJDIR)/forsock.c \ + $(OBJDIR)/fortpk11.c \ + $(OBJDIR)/fmutex.c \ $(NULL) CSRCS = \ - $(COPIED_CSRCS) \ stub.c \ $(NULL) |