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

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index a057ecf9e5e8a65bb2bf83488dfa3eab5e988036..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))
 
@@ -81,8 +84,8 @@ endif
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
-ffserver$(EXESUF): ffserver.o .libs
-       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
+ffserver$(EXESUF): ffserver.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
@@ -102,10 +105,10 @@ version.h:
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-tools/qt-faststart$(EXESUF): qt-faststart.c
+tools/qt-faststart$(EXESUF): tools/qt-faststart.c
        $(CC) $(CFLAGS) $< -o $@
 
-tools/cws2fws$(EXESUF): cws2fws.c
+tools/cws2fws$(EXESUF): tools/cws2fws.c
        $(CC) $(CFLAGS) $< -o $@ -lz
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)
@@ -124,7 +127,8 @@ vhook/%.o: vhook/%.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
 documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
-                                 ffplay-doc.html hooks.html $(ALLMANPAGES))
+                                 ffplay-doc.html general.html hooks.html \
+                                 $(ALLMANPAGES))
 
 doc/%.html: doc/%.texi
        texi2html -monolithic -number $<
@@ -136,27 +140,26 @@ 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 -d "$(bindir)"
-       install -c -m 755 $(PROGS) "$(bindir)"
+install-progs: $(PROGS)
+       install -d "$(BINDIR)"
+       install -c -m 755 $(PROGS) "$(BINDIR)"
 
 # Create the Windows installer.
 wininstaller: all install
        makensis ffinstall.nsi
 
 install-man:
-       install -d "$(mandir)/man1"
-       install -m 644 $(MANPAGES) "$(mandir)/man1"
+       install -d "$(MANDIR)/man1"
+       install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 install-vhook: videohook
-       install -d "$(shlibdir)/vhook"
-       install -m 755 $(HOOKS) "$(shlibdir)/vhook"
+       install -d "$(SHLIBDIR)/vhook"
+       install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
 
 install-libs:
        $(MAKE) -C libavutil   install-libs
@@ -185,27 +188,29 @@ 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))
-       -rmdir "$(shlibdir)/vhook/"
+       rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
+       -rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
        $(MAKE) -C libavutil   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
-       -rmdir "$(incdir)"
+       $(MAKE) -C libswscale  uninstall-headers
+       -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
        $(MAKE) -C libavutil   depend
@@ -221,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,' > $@
 
@@ -249,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]
@@ -277,6 +282,7 @@ codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests
 
 libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
+
 seektest: tests/seek_test$(EXESUF)
        $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
 
@@ -303,8 +309,8 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
 %$(EXESUF): %.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
-tests/seek_test$(EXESUF): tests/seek_test.c
-       $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)
+tests/seek_test$(EXESUF): tests/seek_test.c .libs
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS)
 
 
 .PHONY: all lib videohook documentation install* wininstaller uninstall*