Indent.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 195041e65c01dafef84794b266c9bf980dc170b4..6ed50047d5fc06ea84a116be9a3657b2c3dfc9a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ ifneq ($(PROGS),)
 INSTALL_TARGETS-yes             += install-progs install-data
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
 endif
-INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
+INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
 
 all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
 
@@ -45,7 +45,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES \
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS
 
 define RESET
@@ -65,10 +65,13 @@ ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 
 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
-       $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
+       $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
 
-tools/%$(EXESUF): tools/%.c
-       $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+tools/%$(EXESUF): tools/%.o
+       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+
+tools/%.o: tools.%.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
 
 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
@@ -76,7 +79,7 @@ cmdutils.o cmdutils.d: version.h
 
 alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher))
 
-documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
+documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html ffserver-doc.html \
                                  ffplay-doc.html general.html $(ALLMANPAGES))
 
 doc/%.html: doc/%.texi
@@ -121,7 +124,7 @@ clean:: testclean
        rm -f $(ALLPROGS) $(ALLPROGS_G)
        rm -f $(CLEANSUFFIXES)
        rm -f doc/*.html doc/*.pod doc/*.1
-       rm -f tests/seek_test$(EXESUF)
+       rm -f tests/seek_test$(EXESUF) tests/seek_test.o
        rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
        rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher))
 
@@ -304,8 +307,8 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
 tests/%$(HOSTEXESUF): tests/%.c
        $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
 
-tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
-       $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
+tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
+       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
 .PHONY: documentation *test regtest-* zlib-error alltools check config