small consistency fixes for the ffserver manual

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index c4054303087039d77819415c1cd6cc8a5c448e95..88a816efed696132f532df2082e9670e59b4daa3 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -4,7 +4,7 @@
 
 all: # make "all" default target
 
-ifeq ($(SUBDIR),)
+ifndef SUBDIR
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)
@@ -12,8 +12,7 @@ vpath %.S $(SRC_DIR)
 ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 
 CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-         -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
-         $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS)
+         -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) $(OPTFLAGS)
 
 %.o: %.c
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
@@ -24,6 +23,17 @@ CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 %.ho: %.h
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
 
+%.d: %.c
+       $(DEPEND_CMD) > $@
+
+%.d: %.S
+       $(DEPEND_CMD) > $@
+
+%.d: %.cpp
+       $(DEPEND_CMD) > $@
+
+%$(EXESUF): %.c
+
 install: install-libs install-headers
 
 uninstall: uninstall-libs uninstall-headers
@@ -36,6 +46,7 @@ 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)
@@ -47,33 +58,39 @@ SRCS  := $(addprefix $(SUBDIR),$(SRCS))
 OBJS  := $(addprefix $(SUBDIR),$(OBJS))
 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))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 
-depend dep: $(SUBDIR).depend
+DEPS := $(OBJS:.o=.d)
+depend dep: $(DEPS)
 
-CLEANFILES += *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-              *.def *.dll.a *.exp *.ho *.map
+CLEANSUFFIXES = *.o *~ *.ho
+LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
+DISTCLEANSUFFIXES = *.d
 
 define RULES
-$(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME)
-       $(CC) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS)
+$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
+       $(CC) $(FFLDFLAGS) -o $$@ $$^ $(SUBDIR)$(LIBNAME) $(FFEXTRALIBS)
 
-$(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME)
-       $(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS)
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
+       $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
 
-$(SUBDIR).depend: $(SRCS)
-       $(DEPEND_CMD) > $$@
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+       $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
 
 clean::
-       rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES))
+       rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+           $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 distclean:: clean
-       rm -f $(SUBDIR).depend
+       rm -f  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 endef
 
 $(eval $(RULES))
 
 tests: $(TESTS)
 
--include $(SUBDIR).depend
+-include $(DEPS)