From f4b7a0e4d1ffee255ed7147970ba304d65dd2422 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 12 Dec 2006 20:29:30 +0000 Subject: Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed ASAP, too, though git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21604 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- libaf/Makefile | 2 -- libass/Makefile | 2 +- libmpcodecs/Makefile | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 856aaf6e77..b71a8b525f 100755 --- a/configure +++ b/configure @@ -4600,7 +4600,7 @@ if test "$_sdl" = yes ; then _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" diff --git a/libaf/Makefile b/libaf/Makefile index 6175bb4dd0..08e7347ab8 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -32,8 +32,6 @@ SRCS=af.c \ 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 diff --git a/libass/Makefile b/libass/Makefile index 32952a06f5..4e1b4b5f2d 100644 --- a/libass/Makefile +++ b/libass/Makefile @@ -13,6 +13,6 @@ SRCS = ass.c \ ass_library.c \ ass_font.c \ -CFLAGS = -I../libmpcodecs -D_GNU_SOURCE +CFLAGS = -I../libmpcodecs include ../mpcommon.mak diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index e22660db86..2f00b1ad69 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -157,7 +157,6 @@ CFLAGS = -I.. \ -I../libmpdemux \ -I../stream \ -I../loader \ - -D_GNU_SOURCE \ CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec -- cgit v1.2.3