[MPlayer-cvslog] r21604 - in trunk: configure libaf/Makefile libass/Makefile libmpcodecs/Makefile

reimar subversion at mplayerhq.hu
Tue Dec 12 21:29:31 CET 2006


Author: reimar
Date: Tue Dec 12 21:29:30 2006
New Revision: 21604

Modified:
   trunk/configure
   trunk/libaf/Makefile
   trunk/libass/Makefile
   trunk/libmpcodecs/Makefile

Log:
Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed
ASAP, too, though


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Dec 12 21:29:30 2006
@@ -4600,7 +4600,7 @@
     _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
   else
     _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
-    _inc_extra="$_inc_extra `$_sdlconfig --cflags`"
+    _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
   fi
   _vosrc="$_vosrc vo_sdl.c"
   _vomodules="sdl $_vomodules"

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Tue Dec 12 21:29:30 2006
@@ -32,8 +32,6 @@
 SRCS-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
 
-CFLAGS  = -D_GNU_SOURCE
-
 CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
 

Modified: trunk/libass/Makefile
==============================================================================
--- trunk/libass/Makefile	(original)
+++ trunk/libass/Makefile	Tue Dec 12 21:29:30 2006
@@ -13,6 +13,6 @@
        ass_library.c \
        ass_font.c \
 
-CFLAGS  = -I../libmpcodecs -D_GNU_SOURCE
+CFLAGS  = -I../libmpcodecs
 
 include ../mpcommon.mak

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Tue Dec 12 21:29:30 2006
@@ -157,7 +157,6 @@
           -I../libmpdemux \
           -I../stream \
           -I../loader \
-          -D_GNU_SOURCE \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec



More information about the MPlayer-cvslog mailing list