Attachment #71400 for bug #60940




  PNG_LIBS          = -lpng
  JPEG_LIBS         = -ljpeg
  TIFF_LIB          = -ltiff
  GIF_LIBS          = -lgif
  MAKEDIST          = $(TOPDIR)/Make/makeirixdist

  FREETYPE_INCLUDE  = `freetype-config --cflags`

  PNG_LIBS          = -lpng
  JPEG_LIBS         = -ljpeg
  TIFF_LIB          = -ltiff
  GIF_LIBS          = -lgif
  MAKEDIST          = $(TOPDIR)/Make/makerpms

  ifeq ("$(PROFILER)","gprof")

  PNG_LIBS          = -lpng
  JPEG_LIBS         = -ljpeg
  TIFF_LIB          = -ltiff
  GIF_LIBS          = -lgif

  FREETYPE_INCLUDE  = `freetype-config --cflags`
  FREETYPE_LIB      = `freetype-config --libs`

  QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
  PNG_LIBS        = -lpng -lz
  JPEG_LIBS       = -ljpeg
  GIF_LIBS        = -lgif
  TIFF_LIB       = -ltiff -lz -ljpeg

#  FREETYPE_INCLUDE  = `freetype-config --cflags`

  OTHER_LIBS        = -lOpenThreads
  PNG_LIBS          = -lpng -lz
  JPEG_LIBS         = -L/usr/local/lib -ljpeg
  GIF_LIBS          = -lgif
  TIFF_LIB          = -ltiff -lz -ljpeg

  FREETYPE_INCLUDE  = `freetype-config --cflags`

  OTHER_LIBS        = -lOpenThreads
  PNG_LIBS          = -lpng -lz
  JPEG_LIBS         = -ljpeg
  GIF_LIBS          = -lgif
  TIFF_LIB          = -ltiff -lz -ljpeg

  FREETYPE_LIB      = -lfreetype

  JPEG_LIBS         = -L/usr/local/lib  -ljpeg
  TIFF_INCLUDE      = -I/usr/local/include
  TIFF_LIB          = -L/usr/local/lib -ltiff
  GIF_INCLUDE		= -I/opt/libgif/include
  GIF_LIBS          = -L/opt/libgif/lib -lgif

  FREETYPE_INCLUDE  = `freetype-config --cflags`
  FREETYPE_LIB      = `freetype-config --libs`

Return to bug 60940

Lines 305-311 Link Here

(-)Make/makedefs.orig (-8 / +8 lines)
305	PNG_LIBS = -lpng	305	PNG_LIBS = -lpng
306	JPEG_LIBS = -ljpeg	306	JPEG_LIBS = -ljpeg
307	TIFF_LIB = -ltiff	307	TIFF_LIB = -ltiff
308	GIF_LIBS = -lungif	308	GIF_LIBS = -lgif
309	MAKEDIST = $(TOPDIR)/Make/makeirixdist	309	MAKEDIST = $(TOPDIR)/Make/makeirixdist
310		310
311	FREETYPE_INCLUDE = `freetype-config --cflags`	311	FREETYPE_INCLUDE = `freetype-config --cflags`
Lines 390-396 Link Here
390	PNG_LIBS = -lpng	390	PNG_LIBS = -lpng
391	JPEG_LIBS = -ljpeg	391	JPEG_LIBS = -ljpeg
392	TIFF_LIB = -ltiff	392	TIFF_LIB = -ltiff
393	GIF_LIBS = -lungif	393	GIF_LIBS = -lgif
394	MAKEDIST = $(TOPDIR)/Make/makerpms	394	MAKEDIST = $(TOPDIR)/Make/makerpms
395		395
396	ifeq ("$(PROFILER)","gprof")	396	ifeq ("$(PROFILER)","gprof")
Lines 436-442 Link Here
436	PNG_LIBS = -lpng	436	PNG_LIBS = -lpng
437	JPEG_LIBS = -ljpeg	437	JPEG_LIBS = -ljpeg
438	TIFF_LIB = -ltiff	438	TIFF_LIB = -ltiff
439	GIF_LIBS = -lungif	439	GIF_LIBS = -lgif
440		440
441	FREETYPE_INCLUDE = `freetype-config --cflags`	441	FREETYPE_INCLUDE = `freetype-config --cflags`
442	FREETYPE_LIB = `freetype-config --libs`	442	FREETYPE_LIB = `freetype-config --libs`
Lines 516-522 Link Here
516	QUICKTIME = -framework QuickTime $(CARBON_LIB)	516	QUICKTIME = -framework QuickTime $(CARBON_LIB)
517	PNG_LIBS = -lpng -lz	517	PNG_LIBS = -lpng -lz
518	JPEG_LIBS = -ljpeg	518	JPEG_LIBS = -ljpeg
519	GIF_LIBS = -lungif	519	GIF_LIBS = -lgif
520	TIFF_LIB = -ltiff -lz -ljpeg	520	TIFF_LIB = -ltiff -lz -ljpeg
521		521
522	# FREETYPE_INCLUDE = `freetype-config --cflags`	522	# FREETYPE_INCLUDE = `freetype-config --cflags`
Lines 560-566 Link Here
560	OTHER_LIBS = -lOpenThreads	560	OTHER_LIBS = -lOpenThreads
561	PNG_LIBS = -lpng -lz	561	PNG_LIBS = -lpng -lz
562	JPEG_LIBS = -L/usr/local/lib -ljpeg	562	JPEG_LIBS = -L/usr/local/lib -ljpeg
563	GIF_LIBS = -lungif	563	GIF_LIBS = -lgif
564	TIFF_LIB = -ltiff -lz -ljpeg	564	TIFF_LIB = -ltiff -lz -ljpeg
565		565
566	FREETYPE_INCLUDE = `freetype-config --cflags`	566	FREETYPE_INCLUDE = `freetype-config --cflags`
Lines 621-627 Link Here
621	OTHER_LIBS = -lOpenThreads	621	OTHER_LIBS = -lOpenThreads
622	PNG_LIBS = -lpng -lz	622	PNG_LIBS = -lpng -lz
623	JPEG_LIBS = -ljpeg	623	JPEG_LIBS = -ljpeg
624	GIF_LIBS = -lungif	624	GIF_LIBS = -lgif
625	TIFF_LIB = -ltiff -lz -ljpeg	625	TIFF_LIB = -ltiff -lz -ljpeg
626		626
627	FREETYPE_LIB = -lfreetype	627	FREETYPE_LIB = -lfreetype
Lines 684-691 Link Here
684	JPEG_LIBS = -L/usr/local/lib -ljpeg	684	JPEG_LIBS = -L/usr/local/lib -ljpeg
685	TIFF_INCLUDE = -I/usr/local/include	685	TIFF_INCLUDE = -I/usr/local/include
686	TIFF_LIB = -L/usr/local/lib -ltiff	686	TIFF_LIB = -L/usr/local/lib -ltiff
687	GIF_INCLUDE = -I/opt/libungif/include	687	GIF_INCLUDE = -I/opt/libgif/include
688	GIF_LIBS = -L/opt/libungif/lib -lungif	688	GIF_LIBS = -L/opt/libgif/lib -lgif
689		689
690	FREETYPE_INCLUDE = `freetype-config --cflags`	690	FREETYPE_INCLUDE = `freetype-config --cflags`
691	FREETYPE_LIB = `freetype-config --libs`	691	FREETYPE_LIB = `freetype-config --libs`