Commit c0177790 authored by diego's avatar diego

cosmetics: Break overly long lines.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5622 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bd023e66
...@@ -6,7 +6,9 @@ include config.mak ...@@ -6,7 +6,9 @@ include config.mak
VPATH=$(SRC_PATH) 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 LDFLAGS+= -g
ifeq ($(TARGET_GPROF),yes) ifeq ($(TARGET_GPROF),yes)
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
include ../config.mak include ../config.mak
# NOTE: -I.. is needed to include config.h # 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 \ OBJS= bitstream.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
...@@ -249,7 +250,8 @@ OBJS+= amr.o ...@@ -249,7 +250,8 @@ OBJS+= amr.o
endif endif
ifeq ($(AMR_NB),yes) 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 endif
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
# #
include ../config.mak 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 OBJS= utils.o cutils.o os_support.o allformats.o
CPPOBJS= CPPOBJS=
...@@ -58,7 +60,8 @@ ifeq ($(CONFIG_AUDIO_OSS),yes) ...@@ -58,7 +60,8 @@ ifeq ($(CONFIG_AUDIO_OSS),yes)
OBJS+= audio.o OBJS+= audio.o
endif 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) ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o CPPOBJS+= beosaudio.o
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
include ../config.mak include ../config.mak
# NOTE: -I.. is needed to include config.h # 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 \ OBJS= mathematics.o \
rational.o \ rational.o \
......
...@@ -68,9 +68,13 @@ DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \ ...@@ -68,9 +68,13 @@ DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
$(SRC_PATH)/libavcodec/simple_idct.c $(SRC_PATH)/libavcodec/simple_idct.c
dsptestpic: dsptest.c $(DSPDEPS) 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) 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: distclean clean:
rm -rf vsynth1 vsynth2 data rm -rf vsynth1 vsynth2 data
......
...@@ -2,11 +2,13 @@ include ../config.mak ...@@ -2,11 +2,13 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook 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 #FIXME: This needs to be in configure/config.mak
ifeq ($(CONFIG_DARWIN),yes) 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 endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment