[Mplayer-cvslog] CVS: main Makefile,1.110,1.111

[pl]

On Thu, Nov 29, 2001 at 07:21:02PM +0100, Atmosfear wrote:
> Update of /cvsroot/mplayer/main
> In directory mplayer:/var/tmp.root/cvs-serv16612
> 
> Modified Files:
> 	Makefile 
> Log Message:
> Reinvent Nexus last fix (wrong local merger on last commit)

Next time when these lines will be modified please add a comment 'Order
_really_ matters here' as they will probably be one day :)

> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvsroot/mplayer/main/Makefile,v
> retrieving revision 1.110
> retrieving revision 1.111
> diff -u -r1.110 -r1.111
> --- Makefile	29 Nov 2001 17:31:57 -0000	1.110
> +++ Makefile	29 Nov 2001 18:20:59 -0000	1.111
> @@ -146,7 +146,7 @@
>  endif
>  
>  $(PRG):	$(MPLAYER_DEP)
> -	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(AV_LIB) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
> +	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
>  
>  $(PRG_FIBMAP): fibmap_mplayer.o
>  	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
> 
> _______________________________________________
> Mplayer-cvslog mailing list
> Mplayer-cvslog at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog
> 

-- 
Best regards,
  pl