1
mirror of https://github.com/mpv-player/mpv synced 2024-10-02 16:25:33 +02:00

cosmetics: Shorten overly long lines, put SRCS/OBJS on individual lines

to ease patching in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17944 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-03-25 10:38:37 +00:00
parent eb4a1c08f7
commit 3e56c5bb6b
13 changed files with 124 additions and 23 deletions

View File

@ -9,10 +9,33 @@ OPTIMIZE = $(OPTFLAGS)
CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG)
SRCS = wm/ws.c wm/wsxdnd.c app.c interface.c cfg.c bitmap.c \
skin/skin.c skin/font.c skin/cut.c \
mplayer/widgets.c mplayer/play.c mplayer/mw.c mplayer/sw.c mplayer/menu.c mplayer/pb.c mplayer/common.c \
mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c mplayer/gtk/common.c
SRCS = wm/ws.c \
wm/wsxdnd.c \
app.c \
interface.c \
cfg.c \
bitmap.c \
skin/skin.c \
skin/font.c \
skin/cut.c \
mplayer/widgets.c \
mplayer/play.c \
mplayer/mw.c \
mplayer/sw.c \
mplayer/menu.c \
mplayer/pb.c \
mplayer/common.c \
mplayer/gtk/menu.c \
mplayer/gtk/mb.c \
mplayer/gtk/about.c \
mplayer/gtk/pl.c \
mplayer/gtk/sb.c \
mplayer/gtk/fs.c \
mplayer/gtk/opts.c \
mplayer/gtk/url.c \
mplayer/gtk/eq.c \
mplayer/gtk/common.c \
OBJS = $(SRCS:.c=.o)
.SUFFIXES: .c .o

View File

@ -409,10 +409,21 @@ mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
-L/usr/local/lib/wine -lkernel32
mplayer.exe.so: $(MPLAYER_DEP) mplayer.exe.spec.c
$(CC) $(CFLAGS) -Wall -shared -Wl,-rpath,/usr/local/lib -Wl,-Bsymbolic -o mplayer.exe.so $(OBJS_MPLAYER) mplayer.exe.spec.c libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lwine $(MATH_LIB)
$(CC) $(CFLAGS) -Wall -shared \
-Wl,-rpath,/usr/local/lib -Wl,-Bsymbolic \
-o mplayer.exe.so $(OBJS_MPLAYER) mplayer.exe.spec.c \
libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) \
$(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) \
$(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) \
$(STATIC_LIB) $(ARCH_LIB) -lwine $(MATH_LIB) \
mplayer_wine.so: $(MPLAYER_DEP)
$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) $(MATH_LIB)
$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so \
mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a \
libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) \
$(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) \
$(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) \
-lwine $(ARCH_LIB) $(MATH_LIB) \
ifeq ($(MENCODER),yes)
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
@ -449,7 +460,8 @@ $(MPLAYER_DEP): version.h help_mp.h
$(MENCODER_DEP): version.h help_mp.h
$(PRG_CFG): version.h codec-cfg.c codec-cfg.h help_mp.h
$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \
-DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
install: $(ALL_PRG)
ifeq ($(VIDIX),yes)

View File

@ -26,7 +26,9 @@ png2raw: png2raw.c
$(CC) $< -o $@ -lpng
subrip: subrip.c
$(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o ../mp_msg.o ../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o ../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm
$(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o ../mp_msg.o \
../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o \
../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm
vivodump: vivodump.c
$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a

View File

@ -3,7 +3,15 @@ LIBNAME = liba52.a
include ../config.mak
SRCS = crc.c resample.c bit_allocate.c bitstream.c downmix.c imdct.c imdct_mlib.c parse.c
SRCS = crc.c \
resample.c \
bit_allocate.c \
bitstream.c \
downmix.c \
imdct.c \
imdct_mlib.c \
parse.c \
OBJS = $(SRCS:.c=.o)
CFLAGS = $(MLIB_INC) $(OPTFLAGS) -I..

View File

@ -22,7 +22,11 @@ else
LIBNAME = libdha.so.$(VERSION)
endif
SRCS=libdha.c mtrr.c pci.c pci_names.c
SRCS=libdha.c \
mtrr.c \
pci.c \
pci_names.c \
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -fPIC -I. -I..

View File

@ -3,7 +3,16 @@ include ../config.mak
LIBNAME = libmenu.a
SRCS= menu.c vf_menu.c menu_cmdlist.c menu_pt.c menu_list.c menu_filesel.c menu_txt.c menu_console.c menu_param.c
SRCS= menu.c \
vf_menu.c \
menu_cmdlist.c \
menu_pt.c \
menu_list.c \
menu_filesel.c \
menu_txt.c \
menu_console.c \
menu_param.c \
ifeq ($(DVBIN),yes)
SRCS += menu_dvbin.c
EXTRA_INC += $(DVB_INC)

View File

@ -179,7 +179,11 @@ $(LIBNAME): $(OBJS)
$(RANLIB) $(LIBNAME)
test: $(LIBNAME) test.c
$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o ../m_option.o ../subreader.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
../m_option.o ../subreader.o \
$(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
clean:
rm -f *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~

View File

@ -3,7 +3,14 @@ LIBNAME = libmpeg2.a
include ../config.mak
SRCS = alloc.c cpu_accel.c cpu_state.c decode.c header.c idct.c motion_comp.c slice.c
SRCS = alloc.c \
cpu_accel.c\
cpu_state.c \
decode.c \
header.c \
idct.c \
motion_comp.c \
slice.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC)

View File

@ -7,9 +7,9 @@ DEFINES=-DMPLAYER -D__WINE__ #-Ddbg_printf=__vprintf \
ifeq ($(TARGET_WIN32),yes)
LIB_OBJECTS= driver.o afl.o vfl.o
else
LIB_OBJECTS= ldt_keeper.o pe_image.o module.o \
ext.o win32.o driver.o pe_resource.o \
resource.o registry.o elfdll.o afl.o vfl.o wrapper.o
LIB_OBJECTS= ldt_keeper.o pe_image.o module.o ext.o win32.o \
driver.o pe_resource.o resource.o registry.o \
elfdll.o afl.o vfl.o wrapper.o
endif
# gcc-3.0 produces buggy code for acmStreamOpen() with

View File

@ -4,7 +4,12 @@ LIBNAME = libDMO_Filter.a
include ../../config.mak
# DS_AudioDec.c
SRCS = DMO_AudioDecoder.c DMO_VideoDecoder.c buffer.c dmo.c dmo_guids.c
SRCS = DMO_AudioDecoder.c \
DMO_VideoDecoder.c \
buffer.c \
dmo.c \
dmo_guids.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I../dshow -I.. $(EXTRA_INC)

View File

@ -4,7 +4,15 @@ LIBNAME = libDS_Filter.a
include ../../config.mak
# DS_AudioDec.c
SRCS = DS_AudioDecoder.c DS_Filter.c DS_VideoDecoder.c allocator.c cmediasample.c guids.c inputpin.c outputpin.c
SRCS = DS_AudioDecoder.c \
DS_Filter.c \
DS_VideoDecoder.c \
allocator.c \
cmediasample.c \
guids.c \
inputpin.c \
outputpin.c \
OBJS = $(SRCS:.c=.o)
# OBJS = DS_AudioDec.o DS_VideoDec.o DS_Filter.o allocator.o cmediasample.o guids.o inputpin.o outputpin.o

View File

@ -3,9 +3,16 @@ include ../config.mak
LIBNAME = libosdep.a
SRCS= shmem.c strsep.c strl.c vsscanf.c scandir.c gettimeofday.c fseeko.c \
swab.c setenv.c
# timer.c
SRCS= shmem.c \
strsep.c \
strl.c \
vsscanf.c \
scandir.c \
gettimeofday.c \
fseeko.c \
swab.c \
setenv.c \
# timer.c \
getch = getch2.c
timer = timer-lx.c

View File

@ -3,8 +3,20 @@ LIBNAME = libvorbisidec.a
include ../config.mak
SRCS = bitwise.c block.c codebook.c floor0.c floor1.c framing.c info.c \
mapping0.c mdct.c registry.c res012.c sharedbook.c synthesis.c window.c
SRCS = bitwise.c \
block.c \
codebook.c \
floor0.c \
floor1.c \
framing.c \
info.c \
mapping0.c \
mdct.c \
registry.c \
res012.c \
sharedbook.c \
synthesis.c \
window.c \
OBJS = $(SRCS:.c=.o)
INCLUDE = -I. -I.. $(EXTRA_INC)