[Ffmpeg-cvslog] r5622 - in trunk: Makefile libavcodec/Makefile libavformat/Makefile libavutil/Makefile tests/Makefile vhook/Makefile

[diego]

Author: diego
Date: Wed Jul  5 16:12:00 2006
New Revision: 5622

Modified:
   trunk/Makefile
   trunk/libavcodec/Makefile
   trunk/libavformat/Makefile
   trunk/libavutil/Makefile
   trunk/tests/Makefile
   trunk/vhook/Makefile

Log:
cosmetics: Break overly long lines.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Jul  5 16:12:00 2006
@@ -6,7 +6,9 @@
 
 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)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Jul  5 16:12:00 2006
@@ -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 @@
 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)

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Wed Jul  5 16:12:00 2006
@@ -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 @@
 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

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Wed Jul  5 16:12:00 2006
@@ -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 \

Modified: trunk/tests/Makefile
==============================================================================
--- trunk/tests/Makefile	(original)
+++ trunk/tests/Makefile	Wed Jul  5 16:12:00 2006
@@ -68,9 +68,13 @@
  $(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

Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile	(original)
+++ trunk/vhook/Makefile	Wed Jul  5 16:12:00 2006
@@ -2,11 +2,13 @@
 
 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)