aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-01-27 14:55:16 +0000
committerMåns Rullgård <mans@mansr.com>2008-01-27 14:55:16 +0000
commit20963a71565b3d11815d0f9914c16aab873bd58b (patch)
treebec2e739b6617f5f26ea51b6977167fd76ac9c35
parenta11f43a466df56034a20392f120e7cf5335562ca (diff)
downloadffmpeg-20963a71565b3d11815d0f9914c16aab873bd58b.tar.gz
whitespace cosmetics
Originally committed as revision 11634 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile41
1 files changed, 20 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 26042c6662..3639e11b78 100644
--- a/Makefile
+++ b/Makefile
@@ -75,11 +75,11 @@ MAKE- = : $(MAKE)
all: lib $(PROGS) $(ALL_TARGETS-yes)
lib:
- $(MAKE) -C libavutil all
- $(MAKE) -C libavcodec all
- $(MAKE) -C libavformat all
- $(MAKE) -C libavdevice all
- $(MAKE-$(CONFIG_PP)) -C libpostproc all
+ $(MAKE) -C libavutil all
+ $(MAKE) -C libavcodec all
+ $(MAKE) -C libavformat all
+ $(MAKE) -C libavdevice all
+ $(MAKE-$(CONFIG_PP)) -C libpostproc all
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale all
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
@@ -160,24 +160,23 @@ install-vhook: videohook
install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
install-libs:
- $(MAKE) -C libavutil install-libs
- $(MAKE) -C libavcodec install-libs
- $(MAKE) -C libavformat install-libs
- $(MAKE) -C libavdevice install-libs
- $(MAKE-$(CONFIG_PP)) -C libpostproc install-libs
+ $(MAKE) -C libavutil install-libs
+ $(MAKE) -C libavcodec install-libs
+ $(MAKE) -C libavformat install-libs
+ $(MAKE) -C libavdevice install-libs
+ $(MAKE-$(CONFIG_PP)) -C libpostproc install-libs
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs
-
ifeq ($(BUILD_SHARED),yes)
-$(LDCONFIG)
endif
install-headers:
- $(MAKE) -C libavutil install-headers
- $(MAKE) -C libavcodec install-headers
- $(MAKE) -C libavformat install-headers
- $(MAKE) -C libavdevice install-headers
+ $(MAKE) -C libavutil install-headers
+ $(MAKE) -C libavcodec install-headers
+ $(MAKE) -C libavformat install-headers
+ $(MAKE) -C libavdevice install-headers
$(MAKE-$(CONFIG_PP)) -C libpostproc install-headers
- $(MAKE) -C libswscale install-headers
+ $(MAKE) -C libswscale install-headers
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
@@ -209,11 +208,11 @@ uninstall-headers:
-rmdir "$(INCDIR)"
depend dep: .depend .vhookdep
- $(MAKE) -C libavutil depend
- $(MAKE) -C libavcodec depend
- $(MAKE) -C libavformat depend
- $(MAKE) -C libavdevice depend
- $(MAKE-$(CONFIG_PP)) -C libpostproc depend
+ $(MAKE) -C libavutil depend
+ $(MAKE) -C libavcodec depend
+ $(MAKE) -C libavformat depend
+ $(MAKE) -C libavdevice depend
+ $(MAKE-$(CONFIG_PP)) -C libpostproc depend
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale depend
.depend: $(SRCS) version.h