[Mplayer-cvslog] CVS: main Makefile,1.47,1.48 configure,1.91,1.92 help_avp.h,1.2,NONE

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayerhq:/var/tmp.root/cvs-serv30048

Modified Files:
	Makefile configure 
Removed Files:
	help_avp.h 
Log Message:
OPTFLAGS vs. INCLUDES cleanup

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** Makefile	22 Jun 2001 20:23:14 -0000	1.47
--- Makefile	26 Jun 2001 23:15:56 -0000	1.48
***************
*** 19,23 ****
  SRCS = find_sub.c aviprint.c dll_init.c dec_audio.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
  OBJS = $(SRCS:.c=.o)
! CFLAGS =  -Iloader -Ilibvo $(OPTFLAGS) $(CSS_INC) # -Wall
  A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
  VO_LIBS = -Llibvo -lvo $(X_LIBS)
--- 19,23 ----
  SRCS = find_sub.c aviprint.c dll_init.c dec_audio.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
  OBJS = $(SRCS:.c=.o)
! CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
  A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
  VO_LIBS = -Llibvo -lvo $(X_LIBS)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** configure	24 Jun 2001 19:24:55 -0000	1.91
--- configure	26 Jun 2001 23:15:56 -0000	1.92
***************
*** 1096,1099 ****
--- 1096,1100 ----
  echo "Screen size ... ${_x}x${_y}"
  echo "Checking for X11 libs ... $_x11libdir"
+ echo "Checking for X11 headers ... $_x11incdir"
  echo "Checking mga_vid device ... $_mga"
  echo "Checking for xmga ... $_xmga" 
***************
*** 1116,1119 ****
--- 1117,1122 ----
  echo "Checking for DirectShow ... $_dshow"
  echo "Checking for fastmemcpy ... $_fastmemcpy"
+ echo "Extra libs : $_extralibdir"
+ echo "Extra headers : $_extraincdir"
  # write conf files.
  
***************
*** 1288,1298 ****
  # -------- Generated by ./configure -----------
  
  AR=ar
  CC=$_cc
- X11DIR=$_x11libdir
  # OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
! OPTFLAGS=$CFLAGS $_x11incdir $_extraincdir
! # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib
! X_LIBS=$_x11libdir $_extralibdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
--- 1291,1306 ----
  # -------- Generated by ./configure -----------
  
+ prefix = $_prefix
  AR=ar
  CC=$_cc
  # OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
! OPTFLAGS=$CFLAGS
! EXTRA_INC=$_extraincdir
! WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
! 
! X11_INC=$_x11incdir
! X11DIR=$_x11libdir
! X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
! 
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
***************
*** 1300,1311 ****
  CSS_LIB = $_csslib
  CSS_INC = $_cssinc
- SDL_LIB = $_sdllib
  SDL_INC = $_sdlcflags
- WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
  DS_DEP = $_dshowdep
  DS_LIB = $_dshowlib
  ALSA_LIB = $_alsalib
  ESD_LIB = $_esdlib
- prefix = $_prefix
  ARCH_LIBS = $_archlibs
  STREAM_SRCS = $_streamingsrcs
--- 1308,1316 ----

--- help_avp.h DELETED ---


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog