Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 65c81619408b801fab035ea2ef90daf92d272031..053aa75f33955aeaa97420ef8f5370c2f658a8d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -188,13 +188,13 @@ endif
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
 uninstall-progs:
-       rm -f $(addprefix $(BINDIR)/, $(ALLPROGS))
+       rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
 
 uninstall-man:
-       rm -f $(addprefix $(MANDIR)/man1/,$(ALLMANPAGES))
+       rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
 uninstall-vhook:
-       rm -f $(addprefix $(SHLIBDIR)/vhook/,$(ALLHOOKS))
+       rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
        -rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
@@ -226,7 +226,7 @@ endif
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
-# gcc stupidly only outputs the basename of targets
+# gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS)
        $(CC) $(VHOOKCFLAGS) -MM $^ | sed 's,^\([a-z]\),vhook/\1,' > $@
 
@@ -310,7 +310,7 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
 tests/seek_test$(EXESUF): tests/seek_test.c .libs
-       $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS)
 
 
 .PHONY: all lib videohook documentation install* wininstaller uninstall*