X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=c65bce8a99f40be2576c303c77b671fa88cb4654;hb=dc3e0211ed6203aee04473e5aa09aafeaa8ec55c;hp=b1f3cbc3c9e69a2752ab197822d9001e870a63a3;hpb=969f949300cda963d6bfb8ec870a58007e9641bd;p=ffmpeg

diff --git a/Makefile b/Makefile
index b1f3cbc3c9e..c65bce8a99f 100644
--- a/Makefile
+++ b/Makefile
@@ -67,14 +67,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
 	$(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
 
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
-version.h: $(SVN_ENTRIES)
-endif
-
-version.h:
-	$(SRC_PATH)/version.sh $(SRC_PATH)
-
 output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
 	$(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
@@ -164,7 +156,7 @@ clean::
 	rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean::
-	rm -f version.h config.* *.pc vhook/*.d
+	rm -f version.h config.* vhook/*.d
 
 # regression tests
 
@@ -220,6 +212,7 @@ CODEC_TESTS = $(addprefix regtest-,             \
         adpcm_swf                               \
         flac                                    \
         wma                                     \
+        pcm                                     \
     )
 
 LAVF_TESTS = $(addprefix regtest-,              \
@@ -270,6 +263,15 @@ LAVF_REG     = tests/data/lavf.regression
 ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
+ifeq ($(CONFIG_SWSCALE),yes)
+servertest codectest $(CODEC_TESTS) libavtest: swscale_error
+swscale_error:
+	@echo
+	@echo "This regression test is incompatible with --enable-swscale."
+	@echo
+	@exit 1
+endif
+
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
 	diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
 	diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
@@ -309,15 +311,6 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
 	@echo
 	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
-ifeq ($(CONFIG_SWSCALE),yes)
-servertest codectest $(CODEC_TESTS) libavtest: swscale_error
-swscale_error:
-	@echo
-	@echo "This regression test is incompatible with --enable-swscale."
-	@echo
-	@exit 1
-endif
-
 tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
 	mkdir -p tests/vsynth1
 	$(BUILD_ROOT)/$< 'tests/vsynth1/'