Sdiff make.inc.patch
  1 *** xmcd-3.2.1/make.inc         2003-11-23 10:57:47.188614000 +0000 
  2 --- xmcd-3.2.1/make.inc.new     2003-11-23 10:57:56.489072000 +0000 
  3 ***************
  4 *** 64,92 **** 
  5   #
  6   SHELL=                /bin/sh
  7   MAKE=         make
  8 ! CC=           cc
  9   RANLIB=               /bin/true
 10   AR=           ar cq
 11   RM=           rm -f










 12   LN=           ln -s
 13   CFLAGS=               -O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC) 
 14 ! ARCH=         -DSVR4 -Di386 
 15   MISC=         -DHAS_SETEUID -DHAS_ICONV -DHAS_LAME -DHAS_VORBIS 
 16   TIMER=                -DUSE_SELECT 
 17   TERMIO=               -DUSE_TERMIOS 
 18 ! INCDIRS=      -I.. -I/usr/X/include -I/usr/local/include
 19 ! LOCAL_LIBDIR= -L/usr/local/lib 
 20   CDDBLIB=      -L../cddb_d -lcddb

 21 ! VORBLIB=      -lvorbisenc -lvorbis -logg
 22   # LAMELIB=    -lmp3lame 

 23   # AUDIOLIB=   -lasound
 24 ! XLIBS=                -L/usr/X/lib -lXm -lXt -lX11 -lgen
 25   CURSESLIB=    -lcurses
 26   SOCKETLIB=    -lsocket -lnsl
 27   MATHLIB=      -lm
 28 ! BINDIR=               /usr/bin/X11 
 29 ! LIBDIR=               /usr/lib/X11 
 30 ! MANDIR=               /usr/man/man1 

 31   MANSUF=               .1
 32   DEPEND=               makedepend
 33   DEPENDFLAGS=
 34 --- 64,96 ---- 
 35   # 
 36   SHELL=                /bin/sh 
 37   MAKE=         make 
 38 ! CC=           $(SRC)/tools/gcc         
 39   RANLIB=               /bin/true 
 40   AR=           ar cq 
 41   RM=           rm -f 
 42   LN=           ln -s
 43   CFLAGS=               -O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC) 

 44 ! ARCH=         -DSVR4
 45   MISC=         -DHAS_SETEUID -DHAS_ICONV -DHAS_LAME -DHAS_VORBIS 
 46   TIMER=                -DUSE_SELECT 
 47   TERMIO=               -DUSE_TERMIOS 
 48 ! INCDIRS=      -I.. -I/usr/dt/include -I$(ROOT)/opt/sfw/include \ 
 49 !               -I/usr/sfw/include -I/usr/X/include 

 50   CDDBLIB=      -L../cddb_d -lcddb

 51 ! VORBLIB=      -L$(ROOT)/opt/sfw/lib -R/opt/sfw/lib \
 52 !               -lvorbisenc -lvorbis -logg
 53   # LAMELIB=    -lmp3lame 

 54   # AUDIOLIB=   -lasound
 55 ! XLIBS=                -L/usr/dt/lib -L$(ROOT)/opt/sfw/lib \
 56 !               -L/usr/openwin/lib \
 57 !               -R/usr/dt/lib:/opt/sfw/lib:/usr/openwin/lib \
 58 !               -lXm -lXt -lX11 -lgen
 59   CURSESLIB=    -lcurses
 60   SOCKETLIB=    -lsocket -lnsl
 61   MATHLIB=      -lm

 62 ! BINDIR=               /opt/sfw/bin
 63 ! LIBDIR=               /opt/sfw/lib/X11
 64 ! MANDIR=               /opt/sfw/man/man1
 65   MANSUF=               .1
 66   DEPEND=               makedepend
 67   DEPENDFLAGS=
  1 *** xmcd-3.3.2/make.inc.orig    Wed Apr 21 15:27:01 2004 
  2 --- xmcd-3.3.2/make.inc Mon Jan 19 00:51:47 2009 
  3 ***************
  4 *** 66,72 **** 
  5   #
  6   SHELL=                /bin/sh
  7   MAKE=         make
  8 ! CC=           cc
  9   RANLIB=               /bin/true
 10   AR=           ar cq
 11   RM=           rm -f
 12 --- 66,72 ----
 13   #
 14   SHELL=                /bin/sh
 15   MAKE=         make
 16 ! CC=           $(SRC)/tools/gcc
 17   RANLIB=               /bin/true
 18   AR=           ar cq
 19   RM=           rm -f
 20 ***************
 21 *** 73,96 ****
 22   LN=           ln -s
 23   CFLAGS=               $(DEBUGFLAGS) $(DEFINES) $(INCDIRS) $(ARCH) $(ENCODERS) $(MISC) 
 24   DEBUGFLAGS=   -O 
 25 ! ARCH=         -DSVR4 -Di386 -Kpthread 
 26   MISC=          
 27 ! ENCODERS=     -DHAS_LAME -DHAS_VORBIS -DHAS_FLAC -DHAS_FAAC 
 28 ! INCDIRS=      -I.. -I/usr/X/include -I/usr/local/include

 29   CDDBLIB=      -L../cddb_d -lcddb
 30   LOCAL_LIBDIR= -L/usr/local/lib
 31 ! VORBLIB=      -lvorbisenc -lvorbis -logg
 32 ! FLACLIB=      -lFLAC 
 33 ! ENCLIBS=      $(LOCAL_LIBDIR) $(FLACLIB) $(VORBLIB) 
 34   # AUDIOLIB=   -lasound
 35 ! XLIBS=                -L/usr/X/lib -lXm -lXt -lX11 -lgen
 36   CURSESLIB=    -lcurses
 37   SOCKETLIB=    -lsocket -lnsl
 38   MATHLIB=      -lm
 39   PTHREADLIB=    
 40 ! BINDIR=               /usr/X/bin 
 41 ! LIBDIR=               /usr/X/lib 
 42 ! MANDIR=               /usr/share/man/man1 
 43   MANSUF=               .1
 44   DEPEND=               makedepend
 45   DEPENDFLAGS=
 46 --- 73,102 ---- 







 47   LN=           ln -s
 48   CFLAGS=               $(DEBUGFLAGS) $(DEFINES) $(INCDIRS) $(ARCH) $(ENCODERS) $(MISC) 
 49   DEBUGFLAGS=   -O 
 50 ! ARCH=         -DSVR4
 51   MISC=          
 52 ! ENCODERS=     -DHAS_VORBIS 
 53 ! INCDIRS=      -I.. -I/usr/dt/include -I$(ROOT)/opt/sfw//include \ 

 54 !               -I/usr/sfw/include -I/usr/X/include
 55 ! 
 56   CDDBLIB=      -L../cddb_d -lcddb
 57   LOCAL_LIBDIR= -L/usr/local/lib
 58 ! VORBLIB=      -L$(ROOT)/opt/sfw/lib -R/opt/sfw/lib \
 59 !               -lvorbisenc -lvorbis -logg
 60 ! FLACLIB=       
 61 ! ENCLIBS=      $(LOCAL_LIBDIR) $(VORBLIB) 
 62   # AUDIOLIB=   -lasound
 63 ! XLIBS=                -L/usr/dt/lib -L$(ROOT)/opt/sfw/lib \
 64 !               -L/usr/openwin/lib \
 65 !               -R/usr/dt/lib:/opt/sfw/lib:/usr/openwin/lib \
 66 !               -lXm -lXt -lX11 -lgen
 67   CURSESLIB=    -lcurses
 68   SOCKETLIB=    -lsocket -lnsl
 69   MATHLIB=      -lm
 70   PTHREADLIB=   
 71 ! BINDIR=               /opt/sfw/bin
 72 ! LIBDIR=               /opt/sfw/lib/X11
 73 ! MANDIR=               /opt/sfw/man/man1
 74   MANSUF=               .1
 75   DEPEND=               makedepend
 76   DEPENDFLAGS=