aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-07-05 14:12:00 +0000
committerDiego Biurrun <diego@biurrun.de>2006-07-05 14:12:00 +0000
commitf130fd4630fea7789d2a45c8a42a75d831f990f6 (patch)
treedf588ec204e2cbb321a1ae5368a027af8fa894fe
parent6e03fa50943874e9d96aa6ea7ad0aad6874144ea (diff)
downloadffmpeg-f130fd4630fea7789d2a45c8a42a75d831f990f6.tar.gz
cosmetics: Break overly long lines.
Originally committed as revision 5622 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile4
-rw-r--r--libavcodec/Makefile6
-rw-r--r--libavformat/Makefile7
-rw-r--r--libavutil/Makefile3
-rw-r--r--tests/Makefile8
-rw-r--r--vhook/Makefile6
6 files changed, 24 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index c3a19911ab..0d355fbf82 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,9 @@ include config.mak
VPATH=$(SRC_PATH)
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
LDFLAGS+= -g
ifeq ($(TARGET_GPROF),yes)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fd212f4aba..41287eb8d7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -5,7 +5,8 @@
include ../config.mak
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
OBJS= bitstream.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
@@ -249,7 +250,8 @@ OBJS+= amr.o
endif
ifeq ($(AMR_NB),yes)
-OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
+OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o \
+ amr_float/interf_dec.o amr_float/interf_enc.o
endif
ifeq ($(AMR_NB_FIXED),yes)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2c18a2ab10..5a3452f4dd 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,7 +4,9 @@
#
include ../config.mak
-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+ -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 \
+ -D_LARGEFILE_SOURCE -D_GNU_SOURCE
OBJS= utils.o cutils.o os_support.o allformats.o
CPPOBJS=
@@ -58,7 +60,8 @@ ifeq ($(CONFIG_AUDIO_OSS),yes)
OBJS+= audio.o
endif
-EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) \
+ -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o
diff --git a/libavutil/Makefile b/libavutil/Makefile
index aba43c2084..236810685b 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -4,7 +4,8 @@
include ../config.mak
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
OBJS= mathematics.o \
rational.o \
diff --git a/tests/Makefile b/tests/Makefile
index dab706711e..39c69b40b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -68,9 +68,13 @@ DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
$(SRC_PATH)/libavcodec/simple_idct.c
dsptestpic: dsptest.c $(DSPDEPS)
- $(CC) -fPIC -DPIC -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
+ $(CC) -fPIC -DPIC -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. \
+ -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ \
+ -o $@ $< -lm
dsptest: dsptest.c $(DSPDEPS)
- $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
+ $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. \
+ -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ \
+ -o $@ $< -lm
distclean clean:
rm -rf vsynth1 vsynth2 data
diff --git a/vhook/Makefile b/vhook/Makefile
index 7e073e7c54..a23f1c43a3 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -2,11 +2,13 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook
-CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
+CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \
+ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
#FIXME: This needs to be in configure/config.mak
ifeq ($(CONFIG_DARWIN),yes)
- SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
+ SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace \
+ -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)