summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>1999-06-23 02:46:23 +0000
committercls%seawood.org <devnull@localhost>1999-06-23 02:46:23 +0000
commit1b540749d5864ff394b6296982741f0addcfd177 (patch)
tree67c0305598b6eadfa9faa673d83d69b17ea19815
parentbf39f6e8fc575e93437067fbb3c3a61c3ee28009 (diff)
downloadnspr-hg-1b540749d5864ff394b6296982741f0addcfd177.tar.gz
Put object files in object tree.
-rw-r--r--config/rules.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/rules.mk b/config/rules.mk
index fcdcc957..f0fdcbe2 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -137,8 +137,8 @@ endif
#
ifndef OBJS
-OBJS = $(addprefix $(srcdir)/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \
- $(addprefix $(srcdir)/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX)))
+OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \
+ $(addprefix $(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX)))
endif
ifeq ($(OS_TARGET), WIN16)
@@ -388,18 +388,18 @@ ifeq ($(OS_TARGET), WIN16)
rm w16wccf
else
ifndef XP_OS2_EMX
- $(CC) -Fo$@ -c $(CFLAGS) $*.c
+ $(CC) -Fo$@ -c $(CFLAGS) $<
else
- $(CC) -o $@ -c $(CFLAGS) $*.c
+ $(CC) -o $@ -c $(CFLAGS) $<
endif
endif
else
- $(CC) -o $@ -c $(CFLAGS) $*.c
+ $(CC) -o $@ -c $(CFLAGS) $<
endif
$(OBJDIR)/%.$(OBJ_SUFFIX): %.s
@$(MAKE_OBJDIR)
- $(AS) -o $@ $(ASFLAGS) -c $*.s
+ $(AS) -o $@ $(ASFLAGS) -c $<
%.i: %.c
$(CC) -C -E $(CFLAGS) $< > $*.i