diff options
| -rw-r--r-- | common.mak | 4 | ||||
| -rw-r--r-- | subdir.mak | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common.mak b/common.mak index d4c1f14862..8ac6ee07ad 100644 --- a/common.mak +++ b/common.mak @@ -91,10 +91,10 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c $(SUBDIR)%-test.o: $(SUBDIR)%-test.c $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ -$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm +$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< -$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm +$(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@ clean:: diff --git a/subdir.mak b/subdir.mak index 7c38b77619..df5bb8a09a 100644 --- a/subdir.mak +++ b/subdir.mak @@ -29,7 +29,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIB_CREATE_DEF_CMD) - $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS) + $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) ifdef SUBDIR |