Get rid of MSG_DONTWAIT using a more standard way to use a socket

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 575780688ccac750f1dd05bdf71f18ae8e88e2db..d4c1f14862b1b5e6849575df7658338a39a02c15 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -49,7 +49,7 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
 endif
 
 $(BUILD_ROOT_REL)/version.h:
-       $(SRC_PATH)/version.sh $(SRC_PATH) $@
+       $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION)
 
 install: install-libs install-headers
 
@@ -60,18 +60,12 @@ endif
 
 CFLAGS   += $(CFLAGS-yes)
 OBJS     += $(OBJS-yes)
-ASM_OBJS += $(ASM_OBJS-yes)
-CPP_OBJS += $(CPP_OBJS-yes)
 FFLIBS   := $(FFLIBS-yes) $(FFLIBS)
 TESTS    += $(TESTS-yes)
 
 FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
 FFLDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
 
-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPP_OBJS:.o=.cpp)
-OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS)
-
-SRCS  := $(addprefix $(SUBDIR),$(SRCS))
 OBJS  := $(addprefix $(SUBDIR),$(OBJS))
 TESTS := $(addprefix $(SUBDIR),$(TESTS))
 
@@ -116,4 +110,4 @@ $(eval $(RULES))
 
 tests: $(TESTS)
 
-#-include $(DEPS)
+-include $(DEPS)