Account for indentation in wxDataViewCtrl::GetBestColumnWidth().

[wxWidgets.git] / src / png / scripts / makefile.aix

diff --git a/src/png/scripts/makefile.aix b/src/png/scripts/makefile.aix
index a1e474d14db805f2c8374eb40dd322c4925d87dc..f8a7dd1c8420531e4353d1789e6ebb31f1f8f7db 100644 (file)
--- a/src/png/scripts/makefile.aix
+++ b/src/png/scripts/makefile.aix
@@ -1,9 +1,12 @@
 # makefile for libpng using gcc (generic, static library)
 # makefile for libpng using gcc (generic, static library)

-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson

 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.

-# For conditions of distribution and use, see copyright notice in png.h
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h

 
 # Location of the zlib library and include files
 ZLIBINC = ../zlib
 
 # Location of the zlib library and include files
 ZLIBINC = ../zlib


@@ -12,14 +15,14 @@ ZLIBLIB = ../zlib
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)
 # Compiler, linker, lib and other tools
 CC = gcc
 LD = $(CC)

-AR = ar rcs
+AR_RC = ar rcs
+MKDIR_P = mkdir -p

 RANLIB = ranlib
 RANLIB = ranlib

-RM = rm -f
+RM_F = rm -f
+LN_SF = ln -f -s

 
 

-LIBNAME=libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.7
-PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME=libpng14
+PNGMAJ = 14

 
 prefix=/usr/local
 INCPATH=$(prefix)/include
 
 prefix=/usr/local
 INCPATH=$(prefix)/include


@@ -42,9 +45,9 @@ CDEBUG = -g -DPNG_DEBUG=5
 LDDEBUG =
 CRELEASE = -O2
 LDRELEASE = -s
 LDDEBUG =
 CRELEASE = -O2
 LDRELEASE = -s

-WARNMORE=-Wall
-CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE)
+WARNMORE=-W -Wall
+CFLAGS = -D_ALL_SOURCE -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
+LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE)

 
 # File extensions
 O=.o
 
 # File extensions
 O=.o


@@ -52,7 +55,7 @@ A=.a
 E=
 
 # Variables
 E=
 
 # Variables

-OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
+OBJS =  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)
 
        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
        pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
 


@@ -60,7 +63,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
 all: $(LIBNAME)$(A) pngtest$(E)
 
 $(LIBNAME)$(A): $(OBJS)
 all: $(LIBNAME)$(A) pngtest$(E)
 
 $(LIBNAME)$(A): $(OBJS)

-       $(AR) $@ $(OBJS)
+       $(AR_RC) $@ $(OBJS)

        $(RANLIB) $@
 
 test: pngtest$(E)
        $(RANLIB) $@
 
 test: pngtest$(E)


@@ -70,42 +73,42 @@ pngtest$(E): pngtest$(O) $(LIBNAME)$(A)
        $(LD) -o $@ pngtest$(O) $(LDFLAGS)
 
 install: $(LIBNAME)$(A)
        $(LD) -o $@ pngtest$(O) $(LDFLAGS)
 
 install: $(LIBNAME)$(A)

-       -@if [ ! -d $(DI)  ]; then mkdir $(DI); fi
-       -@if [ ! -d $(DI)/$(LIBNAME)  ]; then mkdir $(DI)/$(LIBNAME); fi
-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@rm -f $(DI)/$(LIBNAME)/png.h
-       -@rm -f $(DI)/$(LIBNAME)/pngconf.h
-       -@rm -f $(DI)/png.h
-       -@rm -f $(DI)/pngconf.h
+       -@if [ ! -d $(DI)  ]; then $(MKDIR_P) $(DI); fi
+       -@if [ ! -d $(DI)/$(LIBNAME)  ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+       -@$(RM_F) $(DI)/$(LIBNAME)/png.h
+       -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h
+       -@$(RM_F) $(DI)/png.h
+       -@$(RM_F) $(DI)/pngconf.h

        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h \
        $(DI)/$(LIBNAME)/pngconf.h
        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h \
        $(DI)/$(LIBNAME)/pngconf.h

-       -@rm -rf $(DI)/libpng
-       (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .)
-       -@rm -f $(DL)/$(LIBNAME)$(A)
-       -@rm -f $(DL)/libpng$(A)
+       -@$(RM_F) -r $(DI)/libpng
+       (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+       -@$(RM_F) $(DL)/$(LIBNAME)$(A)
+       -@$(RM_F) $(DL)/libpng$(A)

        cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)
        chmod 644 $(DL)/$(LIBNAME)$(A)
        cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)
        chmod 644 $(DL)/$(LIBNAME)$(A)

-       (cd $(DL); ln -f -s $(LIBNAME)$(A) libpng$(A))
-       (cd $(DI); ln -f -s libpng/* .;)
+       (cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A))
+       (cd $(DI); $(LN_SF) libpng/* .;)

 
 clean:
 
 clean:

-       /bin/rm -f *.o $(LIBNAME)$(A) pngtest pngout.png
-
-png$(O): png.h pngconf.h
-pngerror$(O): png.h pngconf.h
-pngget$(O): png.h pngconf.h
-pngmem$(O): png.h pngconf.h
-pngpread$(O): png.h pngconf.h
-pngread$(O): png.h pngconf.h
-pngrio$(O): png.h pngconf.h
-pngrtran$(O): png.h pngconf.h
-pngrutil$(O): png.h pngconf.h
-pngset$(O): png.h pngconf.h
-pngtest$(O): png.h pngconf.h
-pngtrans$(O): png.h pngconf.h
-pngwio$(O): png.h pngconf.h
-pngwrite$(O): png.h pngconf.h
-pngwtran$(O): png.h pngconf.h
-pngwutil$(O): png.h pngconf.h
-
+       $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png
+
+png$(O):      png.h pngconf.h pngpriv.h
+pngerror$(O): png.h pngconf.h pngpriv.h
+pngget$(O):   png.h pngconf.h pngpriv.h
+pngmem$(O):   png.h pngconf.h pngpriv.h
+pngpread$(O): png.h pngconf.h pngpriv.h
+pngread$(O):  png.h pngconf.h pngpriv.h
+pngrio$(O):   png.h pngconf.h pngpriv.h
+pngrtran$(O): png.h pngconf.h pngpriv.h
+pngrutil$(O): png.h pngconf.h pngpriv.h
+pngset$(O):   png.h pngconf.h pngpriv.h
+pngtrans$(O): png.h pngconf.h pngpriv.h
+pngwio$(O):   png.h pngconf.h pngpriv.h
+pngwrite$(O): png.h pngconf.h pngpriv.h
+pngwtran$(O): png.h pngconf.h pngpriv.h
+pngwutil$(O): png.h pngconf.h pngpriv.h
+
+pngtest$(O):  png.h pngconf.h