Move doxygen documentation from lzo.c to lzo.h

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index d4c1f14862b1b5e6849575df7658338a39a02c15..4be056c876cbfdeecf449706e99654cf371d1314 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -48,8 +48,8 @@ ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
 $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
 endif
 
-$(BUILD_ROOT_REL)/version.h:
-       $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION)
+$(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh
+       $< $(SRC_PATH) $@ $(EXTRA_VERSION)
 
 install: install-libs install-headers
 
@@ -71,7 +71,7 @@ TESTS := $(addprefix $(SUBDIR),$(TESTS))
 
 DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
 
-ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h))
+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 
 DEPS := $(OBJS:.o=.d)
@@ -91,10 +91,10 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c
 $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
        $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
 
-$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
 
-$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
 
 clean::