build: Rename YASMDEP variable to DEPYASM for consistency

pull/28/head
Diego Biurrun 13 years ago
parent 8ebacfb598
commit 755834e94f
  1. 2
      Makefile
  2. 2
      configure
  3. 2
      library.mak

@ -11,7 +11,7 @@ ifndef V
Q = @ Q = @
ECHO = printf "$(1)\t%s\n" $(2) ECHO = printf "$(1)\t%s\n" $(2)
BRIEF = CC AS YASM AR LD HOSTCC BRIEF = CC AS YASM AR LD HOSTCC
SILENT = DEPCC DEPAS DEPHOSTCC YASMDEP RM RANLIB SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB
MSG = $@ MSG = $@
M = @$(call ECHO,$(TAG),$@); M = @$(call ECHO,$(TAG),$@);
$(foreach VAR,$(BRIEF), \ $(foreach VAR,$(BRIEF), \

2
configure vendored

@ -3411,7 +3411,7 @@ DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
YASM=$yasmexe YASM=$yasmexe
YASMDEP=$yasmexe DEPYASM=$yasmexe
AR=$ar AR=$ar
RANLIB=$ranlib RANLIB=$ranlib
LN_S=$ln_s LN_S=$ln_s

@ -17,7 +17,7 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c
$(COMPILE_C) $(COMPILE_C)
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
$(YASMDEP) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
$(OBJS) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H $(OBJS) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H

Loading…
Cancel
Save