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

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 83f313582a5971c5a28c060012c5832c3544ee10..053aa75f33955aeaa97420ef8f5370c2f658a8d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,10 @@ ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
 
 INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
+ifneq ($(PROGS),)
+INSTALL_TARGETS-yes             += install-progs
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
+endif
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
@@ -137,13 +140,12 @@ doc/%.pod: doc/%-doc.texi
 doc/%.1: doc/%.pod
        pod2man --section=1 --center=" " --release=" " $< > $@
 
-install: install-progs install-libs install-headers $(INSTALL_TARGETS-yes)
+install: install-libs install-headers $(INSTALL_TARGETS-yes)
 
 ifeq ($(BUILD_SHARED),yes)
-install-progs: $(PROGS) install-libs
-else
-install-progs: $(PROGS)
+install-progs: install-libs
 endif
+install-progs: $(PROGS)
        install -d "$(BINDIR)"
        install -c -m 755 $(PROGS) "$(BINDIR)"
 
@@ -186,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:
@@ -200,12 +202,14 @@ uninstall-libs:
        $(MAKE) -C libavcodec  uninstall-libs
        $(MAKE) -C libavformat uninstall-libs
        $(MAKE) -C libpostproc uninstall-libs
+       $(MAKE) -C libswscale  uninstall-libs
 
 uninstall-headers:
        $(MAKE) -C libavutil   uninstall-headers
        $(MAKE) -C libavcodec  uninstall-headers
        $(MAKE) -C libavformat uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
+       $(MAKE) -C libswscale  uninstall-headers
        -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
@@ -222,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,' > $@
 
@@ -250,7 +254,7 @@ distclean: clean
        $(MAKE) -C libavformat distclean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C libswscale  distclean
-       rm -f .depend version.h config.* *.pc
+       rm -f .depend .vhookdep version.h config.* *.pc
 
 TAGS:
        etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
@@ -306,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*