indent

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index caeb56e62e78cc09590696acf9e680d8368aafa5..2951ebc6c9210061d29f2cff6768d922efe52bd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,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 +102,10 @@ version.h:
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-qt-faststart$(EXESUF): qt-faststart.c
+tools/qt-faststart$(EXESUF): tools/qt-faststart.c
        $(CC) $(CFLAGS) $< -o $@
 
-cws2fws$(EXESUF): cws2fws.c
+tools/cws2fws$(EXESUF): tools/cws2fws.c
        $(CC) $(CFLAGS) $< -o $@ -lz
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)
@@ -124,7 +124,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 $<
@@ -143,20 +144,20 @@ install-progs: $(PROGS) install-libs
 else
 install-progs: $(PROGS)
 endif
-       install -d "$(bindir)"
-       install -c -m 755 $(PROGS) "$(bindir)"
+       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 +186,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)/vhook/,$(ALLHOOKS))
+       -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
@@ -249,7 +252,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 +280,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,7 +307,7 @@ tests/asynth1.sw: tests/audiogen$(EXESUF)
 %$(EXESUF): %.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
-tests/seek_test$(EXESUF): tests/seek_test.c
+tests/seek_test$(EXESUF): tests/seek_test.c .libs
        $(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -o $@ $< $(EXTRALIBS)