mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-09 05:14:24 +00:00
Back out changes which prevent NT from building. Need to figure something else out (sigh).
bob
This commit is contained in:
parent
620f2260ab
commit
b435cc8059
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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)
|
||||
forsock.c: ../../forsock.c $(CP_INCLUDES)
|
||||
cp ../../forsock.c $(CP_INCLUDES) .
|
||||
|
||||
$(OBJDIR)/forsock.c: ../../forsock.c $(OBJDIR)/maci.h
|
||||
cp ../../forsock.c $(OBJDIR)
|
||||
|
||||
$(OBJDIR)/fortpk11.c: ../../fortpk11.c $(OBJDIR)/maci.h
|
||||
cp ../../fortpk11.c $(OBJDIR)
|
||||
|
||||
$(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 .
|
||||
|
||||
|
||||
#
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user