diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-04-30 23:21:51 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-04-30 23:21:51 +0000 |
| commit | c3925b829967b1038bfbb9c8837f91f44962f49f (patch) | |
| tree | 4b0a3a6ade9f3fb600474153170faff2de3cb727 /security/coreconf | |
| parent | 9b5c8a568dea76ed401a91b279707a8fc977c8ed (diff) | |
| download | nss-hg-c3925b829967b1038bfbb9c8837f91f44962f49f.tar.gz | |
Use the correct Make variables in the .cpp .s .S and .asm rules to vpath works
correctly.
remove the spurious vpath= line.
Diffstat (limited to 'security/coreconf')
| -rw-r--r-- | security/coreconf/rules.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index e72740ed0..eb9d0e89d 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -392,7 +392,6 @@ WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2)) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) - @echo vpath=$(VPATH) ifdef USE_NT_C_SYNTAX $(CC) -Fo$@ -c $(CFLAGS) $(subst /,\\,$<) else @@ -402,16 +401,16 @@ endif ifneq ($(OS_ARCH), WINNT) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s @$(MAKE_OBJDIR) - $(AS) -o $@ $(ASFLAGS) -c $*.s + $(AS) -o $@ $(ASFLAGS) -c $< endif $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm @$(MAKE_OBJDIR) - $(AS) -Fo$@ $(ASFLAGS) -c $*.asm + $(AS) -Fo$@ $(ASFLAGS) -c $< $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S @$(MAKE_OBJDIR) - $(AS) -o $@ $(ASFLAGS) -c $*.S + $(AS) -o $@ $(ASFLAGS) -c $< $(OBJDIR)/$(PROG_PREFIX)%: %.cpp @$(MAKE_OBJDIR) @@ -426,19 +425,19 @@ endif # $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cc @$(MAKE_OBJDIR) - $(CCC) -o $@ -c $(CFLAGS) $*.cc + $(CCC) -o $@ -c $(CFLAGS) $< $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cpp @$(MAKE_OBJDIR) ifdef STRICT_CPLUSPLUS_SUFFIX - echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > $(OBJDIR)/t_$*.cc + echo "#line 1 \"$<\"" | cat - $< > $(OBJDIR)/t_$*.cc $(CCC) -o $@ -c $(CFLAGS) $(OBJDIR)/t_$*.cc rm -f $(OBJDIR)/t_$*.cc else ifdef USE_NT_C_SYNTAX - $(CCC) -Fo$@ -c $(CFLAGS) $*.cpp + $(CCC) -Fo$@ -c $(CFLAGS) $< else - $(CCC) -o $@ -c $(CFLAGS) $*.cpp + $(CCC) -o $@ -c $(CFLAGS) $< endif endif #STRICT_CPLUSPLUS_SUFFIX |