Mercurial > mplayer.hg
changeset 27327:a336468a5747
Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile and
use them only when compiling objects from those subdirectories.
| author | diego |
|---|---|
| date | Mon, 28 Jul 2008 16:57:22 +0000 |
| parents | 2d40cb917037 |
| children | 6a105f83eb87 |
| files | Makefile configure |
| diffstat | 2 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Jul 28 16:47:19 2008 +0000 +++ b/Makefile Mon Jul 28 16:57:22 2008 +0000 @@ -783,9 +783,9 @@ mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d osdep/mplayer-rc.o: version.h $(DEPS): help_mp.h -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" -libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE +libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) #loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
--- a/configure Mon Jul 28 16:47:19 2008 +0000 +++ b/configure Mon Jul 28 16:57:22 2008 +0000 @@ -7639,11 +7639,6 @@ fi fi -# Make sure config.h gets included. -if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then - CFLAGS="$CFLAGS -DHAVE_CONFIG_H" -fi - CFLAGS="-I. $CFLAGS" CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"