diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2002-02-21 21:23:14 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2002-02-21 21:23:14 +0000 |
| commit | e640ea38faece6920f0caaabfa2486db6d8c09bc (patch) | |
| tree | 2faab8294ad7fc8c3714635cd5c0be7d99db8436 | |
| parent | 50b16435335d5b35222b66b05d613e239a4a6403 (diff) | |
| download | nss-hg-e640ea38faece6920f0caaabfa2486db6d8c09bc.tar.gz | |
Fix warning on Windows builds. Bug 104541.
| -rw-r--r-- | security/coreconf/rules.mk | 4 | ||||
| -rw-r--r-- | security/coreconf/ruleset.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 728adc023..76043627a 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -323,7 +323,7 @@ SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $ endif endif -$(SHARED_LIBRARY): $(OBJS) $(MAPFILE) +$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) @$(MAKE_OBJDIR) rm -f $@ ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1) @@ -336,7 +336,7 @@ ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1) -bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) else ifeq (,$(filter-out WIN%,$(OS_TARGET))) - $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS)) + $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)) else ifeq ($(OS_TARGET),OS2) @cmd /C "echo LIBRARY $(notdir $(basename $(SHARED_LIBRARY))) INITINSTANCE TERMINSTANCE >$@.def" diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index 1453afebd..8a9385c9a 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -146,7 +146,7 @@ ifndef OBJS $(BUILT_CSRCS:.c=$(OBJ_SUFFIX)) \ $(BUILT_CPPSRCS:.cpp=$(OBJ_SUFFIX)) \ $(BUILT_ASFILES:$(ASM_SUFFIX)=$(OBJ_SUFFIX)) - OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS)) $(RES) + OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS)) endif ifndef BUILT_SRCS |