diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-12-03 01:41:49 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-12-03 01:41:49 +0000 |
| commit | 9e7b41aba5b2692e50063b2bd6ce59ce015aee1c (patch) | |
| tree | 2ecabc2754e686e8c7cbd36f2cb34977d8efc6a4 | |
| parent | f05c4befc7fe95aa0abe5f5420769ed389c58e87 (diff) | |
| download | nss-hg-9e7b41aba5b2692e50063b2bd6ce59ce015aee1c.tar.gz | |
Merged the fixes for bug 166721 and 181913 on the NSS_3_7_BRANCH.
| -rw-r--r-- | security/coreconf/rules.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index c53c1ffc5..e0effdd87 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) $(RES) $(MAPFILE) +$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) $(SUB_SHLOBJS) @$(MAKE_OBJDIR) rm -f $@ ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1) @@ -414,11 +414,13 @@ else $(CC) -o $@ -c $(CFLAGS) $< endif +ifndef XP_OS2_VACPP ifneq (,$(filter-out WIN%,$(OS_TARGET))) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s @$(MAKE_OBJDIR) $(AS) -o $@ $(ASFLAGS) -c $< endif +endif $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm @$(MAKE_OBJDIR) |