Part 2 of EAC3 support, this is still disabled as it breaks regressions

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index a7c919e22895ff59f7a13c958fcda83b9899ccd7..eb40ff329b13faa16b0ed737de5e19e905f26ebc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES
+SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS TESTS
 
 define RESET
 $(1) :=
@@ -85,7 +85,7 @@ output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
 tools/%$(EXESUF): tools/%.c
        $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
+ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
@@ -112,6 +112,7 @@ vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
 # vhooks compile fine without libav*, but need them nonetheless.
 videohook: $(FF_DEP_LIBS) $(HOOKS)
 
+$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
 vhook/%$(SLIBSUF): vhook/%.o
        $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))