[MPlayer-cvslog] CVS: main Makefile,1.351,1.352
Diego Biurrun CVS
syncmail at mplayerhq.hu
Sat Mar 25 11:38:38 CET 2006
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14477
Modified Files:
Makefile
Log Message:
cosmetics: Shorten overly long lines, put SRCS/OBJS on individual lines
to ease patching in the future.
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- Makefile 22 Mar 2006 00:19:00 -0000 1.351
+++ Makefile 25 Mar 2006 10:38:35 -0000 1.352
@@ -409,10 +409,21 @@
-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 @@
$(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)
More information about the MPlayer-cvslog
mailing list