diff options
author | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2012-02-22 09:01:10 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2012-02-22 09:01:10 -0600 |
commit | 715423c8d61fceea615b99d84aacdb546050fa99 (patch) | |
tree | da4911327b588884a7e4a689451092371113f502 /scripts/makefile.ibmc | |
parent | 59d3ef11ed5db47eabc3e4ed8c10ff5889d526d7 (diff) | |
parent | d57dc304c4675c7dd1983c79bcb63292735681b6 (diff) | |
download | libpng-715423c8d61fceea615b99d84aacdb546050fa99.tar.gz |
Merge branch 'libpng15'
Conflicts:
ANNOUNCE
CHANGES
CMakeLists.txt
INSTALL
LICENSE
Makefile.am
Makefile.in
README
TODO
aclocal.m4
config.guess
config.h.in
config.sub
configure
configure.ac
contrib/gregbook/COPYING
contrib/gregbook/Makefile.sgi
contrib/gregbook/Makefile.unx
contrib/gregbook/README
contrib/gregbook/readpng2.c
contrib/gregbook/rpng-x.c
contrib/gregbook/rpng2-win.c
contrib/gregbook/rpng2-x.c
contrib/pngminim/decoder/README
contrib/pngminim/decoder/makefile
contrib/pngminim/decoder/pngusr.h
contrib/pngminim/encoder/README
contrib/pngminim/encoder/makefile
contrib/pngminim/encoder/pngusr.h
contrib/pngminim/preader/README
contrib/pngminim/preader/makefile
contrib/pngminim/preader/pngusr.h
contrib/pngminus/makefile.std
contrib/pngsuite/README
contrib/visupng/PngFile.c
contrib/visupng/PngFile.h
contrib/visupng/VisualPng.c
depcomp
example.c
install-sh
libpng-1.4.9beta01.txt
libpng-manual.txt
libpng.3
libpng.txt
libpngpf.3
ltmain.sh
png.5
png.c
png.h
pngconf.h
pngerror.c
pngget.c
pngmem.c
pngpread.c
pngpriv.h
pngread.c
pngrio.c
pngrtran.c
pngrutil.c
pngset.c
pngtest.c
pngtest.png
pngtrans.c
pngwio.c
pngwrite.c
pngwtran.c
pngwutil.c
projects/visualc6/README.txt
projects/visualc6/libpng.dsp
projects/visualc6/pngtest.dsp
projects/visualc71/README.txt
projects/visualc71/libpng.sln
projects/visualc71/libpng.vcproj
projects/visualc71/pngtest.vcproj
projects/visualc71/zlib.vcproj
projects/vstudio/libpng/libpng.vcxproj
projects/vstudio/pngtest/pngtest.vcxproj
projects/vstudio/readme.txt
projects/vstudio/vstudio.sln
projects/vstudio/zlib.props
projects/vstudio/zlib/zlib.vcxproj
scripts/README.txt
scripts/descrip.mms
scripts/libpng-config-head.in
scripts/libpng.pc.in
scripts/makefile.32sunu
scripts/makefile.64sunu
scripts/makefile.aix
scripts/makefile.amiga
scripts/makefile.bc32
scripts/makefile.beos
scripts/makefile.bor
scripts/makefile.cegcc
scripts/makefile.cygwin
scripts/makefile.darwin
scripts/makefile.dec
scripts/makefile.dj2
scripts/makefile.elf
scripts/makefile.freebsd
scripts/makefile.gcc
scripts/makefile.hp64
scripts/makefile.hpgcc
scripts/makefile.hpux
scripts/makefile.ibmc
scripts/makefile.intel
scripts/makefile.knr
scripts/makefile.linux
scripts/makefile.mingw
scripts/makefile.mips
scripts/makefile.msc
scripts/makefile.ne12bsd
scripts/makefile.netbsd
scripts/makefile.openbsd
scripts/makefile.os2
scripts/makefile.sco
scripts/makefile.sggcc
scripts/makefile.sgi
scripts/makefile.so9
scripts/makefile.solaris
scripts/makefile.solaris-x86
scripts/makefile.std
scripts/makefile.sunos
scripts/makefile.tc3
scripts/makefile.vcwin32
scripts/makefile.watcom
scripts/makevms.com
scripts/png32ce.def
scripts/pngos2.def
Diffstat (limited to 'scripts/makefile.ibmc')
-rw-r--r-- | scripts/makefile.ibmc | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index b0b445ab2..209d513b1 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -41,6 +41,10 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A) # Targets all: libpng$(A) pngtest$(E) +# see scripts/pnglibconf.mak for more options +pnglibconf.h: scripts/pnglibconf.h.prebuilt + cp scripts/pnglibconf.h.prebuilt $@ + libpng$(A): $(OBJS) $(AR) -out:$@ $(OBJS) @@ -55,23 +59,24 @@ pngtest$(E): pngtest$(O) libpng$(A) clean: $(RM) *$(O) $(RM) libpng$(A) + $(RM) pnglibconf.h $(RM) pngtest$(E) $(RM) 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 +png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h +pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngtest$(O): png.h pngconf.h +pngtest$(O): png.h pngconf.h pnglibconf.h |