av_log(NULL,... -> av_log(avctx,.. where appropriate.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 03bc8b1a59b9ca7c0e51402e33ef3bdee2beb570..d4a8dca416f173ecff82d6cb61d07de4fa4a2761 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,16 +2,17 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/lib$(NAME)
-VPATH = $(SRC_DIR)
+VPATH = $(SRC_PATH_BARE)/lib$(NAME)
+SRC_DIR = "$(VPATH)"
 
+CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+          -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
+          -I$(SRC_PATH)/libavutil $(OPTFLAGS)
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
-EXTRALIBS := -L$(SRC_PATH)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
 all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
 
 $(LIB): $(STATIC_OBJS)
@@ -36,12 +37,15 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %.o: %.cpp
        g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 
+%: %.o $(LIB)
+       $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+
 depend dep: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 clean::
        rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.lib *.def *.dll.a *.exp
+             *.def *.dll.a *.exp
 
 distclean: clean
        rm -f .depend
@@ -74,7 +78,7 @@ install-lib-static: $(LIB)
 install-headers:
        install -d "$(incdir)"
        install -d "$(libdir)/pkgconfig"
-       install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
+       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
        install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
@@ -86,14 +90,11 @@ uninstall-libs:
        -rm -f "$(libdir)/$(LIB)"
 
 uninstall-headers:
-       rm -f "$(addprefix $(incdir)/,$(HEADERS))"
+       rm -f $(addprefix "$(incdir)/",$(HEADERS))
        rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-#
-# include dependency files if they exist
-#
 ifneq ($(wildcard .depend),)
 include .depend
 endif