enable nut muxer

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index e90d0fcb8caf9f00c9dd0fe2ab3344f0b3ec39d0..2fd677d9505cb2ba0ac57616bd7ad07c9990d23a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)
@@ -143,20 +143,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,14 +185,14 @@ 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
@@ -205,7 +205,7 @@ uninstall-headers:
        $(MAKE) -C libavcodec  uninstall-headers
        $(MAKE) -C libavformat uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
-       -rmdir "$(incdir)"
+       -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
        $(MAKE) -C libavutil   depend
@@ -275,18 +275,10 @@ codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests
        $(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE)   tests/vsynth1
        $(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
 
-ifeq ($(CONFIG_GPL),yes)
 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)
-else
-libavtest seektest:
-       @echo
-       @echo "This test requires FFmpeg to be compiled with --enable-gpl."
-       @echo
-       @exit 1
-endif
 
 ifeq ($(CONFIG_SWSCALER),yes)
 test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error