summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-07-25 13:25:58 +0200
committerDiego Biurrun <diego@biurrun.de>2012-07-28 02:02:19 +0200
commit755834e94f46eb1c0cdba28cccf2475ecec3662b (patch)
treef08ca102e14f0d6714f6aa77dc6e916e1cc00808
parent8ebacfb598933f66ff34ad1b12cb1aa14928ac73 (diff)
build: Rename YASMDEP variable to DEPYASM for consistency
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
-rw-r--r--library.mak2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3716e9ee84..37faa76fda 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ifndef V
Q = @
ECHO = printf "$(1)\t%s\n" $(2)
BRIEF = CC AS YASM AR LD HOSTCC
-SILENT = DEPCC DEPAS DEPHOSTCC YASMDEP RM RANLIB
+SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB
MSG = $@
M = @$(call ECHO,$(TAG),$@);
$(foreach VAR,$(BRIEF), \
diff --git a/configure b/configure
index 715e49b020..6945152dae 100755
--- a/configure
+++ b/configure
@@ -3411,7 +3411,7 @@ DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
YASM=$yasmexe
-YASMDEP=$yasmexe
+DEPYASM=$yasmexe
AR=$ar
RANLIB=$ranlib
LN_S=$ln_s
diff --git a/library.mak b/library.mak
index 6159799c5d..cd3fdc28f9 100644
--- a/library.mak
+++ b/library.mak
@@ -17,7 +17,7 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c
$(COMPILE_C)
$(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 $@ $<
$(OBJS) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H