Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile and

use them only when compiling objects from those subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 2 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 9987b9fb6b..4aed826653 100644
--- a/Makefile
+++ b/Makefile
@@ -783,9 +783,9 @@ codec-cfg.d: codecs.conf.h
 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
diff --git a/configure b/configure
index 4537690bbb..ef122026de 100755
--- a/configure
+++ b/configure
@@ -7639,11 +7639,6 @@ if test "$_largefiles" = yes || freebsd ; then
   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"