*** Makefile.ORIG	Fri Jun 26 15:25:26 2009
--- Makefile	Fri Jun 26 15:29:08 2009
***************
*** 11,27 ****
  # macros --------------------------------------------------------------------
  
  # uncomment these 2 lines only if you are using an external copy of zlib:
! #ZINC = ../../zlib
! #ZLIB = ../../zlib
  
! CC = gcc
! LD = gcc
  # CC = /usr/local/bin/gcc-4.3.3
  # LD = /usr/local/bin/gcc-4.3.3
  RM = rm -f
  #CFLAGS = -I. -O -Wall
  #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall
! CFLAGS = -I. -O3 -fomit-frame-pointer -Wall -Wshadow
  #CFLAGS = -I${ZINC} -I. -O3 -fomit-frame-pointer -Wall
  # [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
  LDFLAGS =
--- 11,28 ----
  # macros --------------------------------------------------------------------
  
  # uncomment these 2 lines only if you are using an external copy of zlib:
! ZINC = /opt/freeware/include
! ZLIB = /opt/freeware/lib
  
! CC = cc
! LD = cc
  # CC = /usr/local/bin/gcc-4.3.3
  # LD = /usr/local/bin/gcc-4.3.3
  RM = rm -f
  #CFLAGS = -I. -O -Wall
  #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall
! #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall -Wshadow
! CFLAGS = -I${ZINC} -O
  #CFLAGS = -I${ZINC} -I. -O3 -fomit-frame-pointer -Wall
  # [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
  LDFLAGS =
***************
*** 30,49 ****
  
  PNGCRUSH  = pngcrush
  
! LIBS = -lm
! #LIBS = -L${ZLIB} -lz -lm
  #LIBS = ${ZLIB}/libz.a -lm
  
  # uncomment these 4 lines only if you are NOT using an external copy of zlib:
  ZHDR = zlib.h
! ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \
! 	 infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
! 	 trees$(O) uncompr$(O) zutil$(O)
  
! OBJS  = pngcrush$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
! 	pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
! 	pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
! 	pngwtran$(O) pngwutil$(O) $(ZOBJS)
  
  EXES = $(PNGCRUSH)$(E)
  
--- 31,52 ----
  
  PNGCRUSH  = pngcrush
  
! #LIBS = -lm
! LIBS = -L${ZLIB} -lpng -lz -lm
  #LIBS = ${ZLIB}/libz.a -lm
  
  # uncomment these 4 lines only if you are NOT using an external copy of zlib:
  ZHDR = zlib.h
! #ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \
! #	 infback$(O) inffast$(O) inflate$(O) inftrees$(O) \
! #	 trees$(O) uncompr$(O) zutil$(O)
! ZOBJS  = inflate$(O)
  
! #OBJS  = pngcrush$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
! #	pngpread$(O) pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \
! #	pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
! #	pngwtran$(O) pngwutil$(O) $(ZOBJS)
! OBJS  = pngcrush$(O) $(ZOBJS)
  
  EXES = $(PNGCRUSH)$(E)
  
