From 373dc625f82b47096893add42c4472e4a57ab7eb Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 9 Feb 2022 22:23:03 +0100 Subject: Moved third-party libraries to a separate subdirectory --- libpng/contrib/pngminim/decoder/README | 10 -- libpng/contrib/pngminim/decoder/makefile | 149 ----------------------------- libpng/contrib/pngminim/decoder/pngusr.dfa | 39 -------- libpng/contrib/pngminim/decoder/pngusr.h | 23 ----- 4 files changed, 221 deletions(-) delete mode 100644 libpng/contrib/pngminim/decoder/README delete mode 100644 libpng/contrib/pngminim/decoder/makefile delete mode 100644 libpng/contrib/pngminim/decoder/pngusr.dfa delete mode 100644 libpng/contrib/pngminim/decoder/pngusr.h (limited to 'libpng/contrib/pngminim/decoder') diff --git a/libpng/contrib/pngminim/decoder/README b/libpng/contrib/pngminim/decoder/README deleted file mode 100644 index 5618cb7..0000000 --- a/libpng/contrib/pngminim/decoder/README +++ /dev/null @@ -1,10 +0,0 @@ -This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa - -The makefile builds a minimal read-only decoder with embedded libpng -and zlib. - -Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC -on the make command line. - -If you prefer to use the shared libraries, go to contrib/pngminus -and build the png2pnm application there. diff --git a/libpng/contrib/pngminim/decoder/makefile b/libpng/contrib/pngminim/decoder/makefile deleted file mode 100644 index 43e45bd..0000000 --- a/libpng/contrib/pngminim/decoder/makefile +++ /dev/null @@ -1,149 +0,0 @@ -# Makefile for PngMinus (pngm2pnm) -# Linux / Unix - -#CC=cc -CC=gcc -LD=$(CC) -STRIP=strip - -# If awk fails try -# make AWK=nawk - -RM=rm -f -COPY=cp - -CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP -I. -O1 - -C=.c -O=.o -L=.a -E= - -# Where to find the source code: -PNGSRC =../../.. -ZLIBSRC=$(PNGSRC)/../zlib -PROGSRC=$(PNGSRC)/contrib/pngminus - -# Zlib (minimal inflate requirements - crc32 is used by libpng) -# zutil can be eliminated if you provide your own zcalloc and zcfree -ZSRCS = adler32$(C) crc32$(C) \ - inffast$(C) inflate$(C) inftrees$(C) \ - zutil$(C) - -# Standard headers -ZH = zlib.h crc32.h inffast.h inffixed.h \ - inflate.h inftrees.h zutil.h - -# Machine generated headers -ZCONF = zconf.h - -# Headers callers use -ZINC = zlib.h $(ZCONF) - -# Headers the Zlib source uses -ZHDRS = $(ZH) $(ZCONF) - -ZOBJS = adler32$(O) crc32$(O) \ - inffast$(O) inflate$(O) inftrees$(O) \ - zutil$(O) - -# libpng -PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \ - pngread$(C) pngrio$(C) pngrtran$(C) pngrutil$(C) \ - pngset$(C) pngtrans$(C) - -# Standard headers -PNGH =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h - -# Machine generated headers -PNGCONF=pnglibconf.h - -# Headers callers use -PNGINC= png.h pngconf.h pngusr.h $(PNGCONF) - -# Headers the PNG library uses -PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h - -PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \ - pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) \ - pngset$(O) pngtrans$(O) - -PROGSRCS= pngm2pnm$(C) -PROGHDRS= -PROGDOCS= -PROGOBJS= pngm2pnm$(O) - -OBJS = $(PROGOBJS) $(PNGOBJS) $(ZOBJS) - -# implicit make rules ------------------------------------------------------- - -# note: dependencies do not work on implicit rule lines -.c$(O): - $(CC) -c $(CFLAGS) $< - -# dependencies - -all: pngm2pnm$(E) - -pngm2pnm$(E): $(OBJS) - $(LD) -o pngm2pnm$(E) $(OBJS) - $(STRIP) pngm2pnm$(E) - -# The DFA_XTRA setting turns all libpng options off then -# turns on those required for this minimal build. -# The CPP_FLAGS setting causes pngusr.h to be included in -# both the build of pnglibconf.h and, subsequently, when -# building libpng itself. -$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\ - $(PNGSRC)/scripts/pnglibconf.dfa \ - $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa - $(RM) pnglibconf.h pnglibconf.dfn - $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ - srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\ - DFA_XTRA="pngusr.dfa" $@ - -clean: - $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\ - srcdir=$(PNGSRC) clean - $(RM) pngm2pnm$(O) - $(RM) pngm2pnm$(E) - $(RM) $(OBJS) - -# distclean also removes the copied source and headers -distclean: clean - $(RM) -r scripts # historical reasons - $(RM) $(PNGSRCS) $(PNGH) - $(RM) $(ZSRCS) $(ZH) $(ZCONF) - $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS) - -# Header file dependencies: -$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC) -$(PNGOBJS): $(PNGHDRS) $(ZINC) -$(ZOBJS): $(ZHDRS) - -# Gather the source code from the respective directories -$(PNGSRCS) $(PNGH): $(PNGSRC)/$@ - $(RM) $@ - $(COPY) $(PNGSRC)/$@ $@ - -# No dependency on the ZLIBSRC target so that it only needs -# to be specified once. -$(ZSRCS) $(ZH): - $(RM) $@ - $(COPY) $(ZLIBSRC)/$@ $@ - -# The unconfigured zconf.h varies in name according to the -# zlib release -$(ZCONF): - $(RM) $@ - @for f in zconf.h.in zconf.in.h zconf.h; do\ - test -r $(ZLIBSRC)/$$f &&\ - echo $(COPY) $(ZLIBSRC)/$$f $@ &&\ - $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\ - done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1 - -pngm2pnm.c: $(PROGSRC)/png2pnm.c - $(RM) $@ - $(COPY) $(PROGSRC)/png2pnm.c $@ - -# End of makefile for pngm2pnm diff --git a/libpng/contrib/pngminim/decoder/pngusr.dfa b/libpng/contrib/pngminim/decoder/pngusr.dfa deleted file mode 100644 index 9653cd1..0000000 --- a/libpng/contrib/pngminim/decoder/pngusr.dfa +++ /dev/null @@ -1,39 +0,0 @@ -# pngminim/decoder/pngusr.dfa -# -# Copyright (c) 2010-2011 Glenn Randers-Pehrson -# -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h - -# First all the build options off: - -everything = off - -# All that is required is some read code. This example switches -# on the sequential read code (see ../preader for a progressive -# read example). - -option SEQUENTIAL_READ on - -# You must choose fixed or floating point arithmetic: -# option FLOATING_POINT on - -option FIXED_POINT on - -# You must chose the internal fixed point implementation or to -# use the system floating point. The latter is considerably -# smaller (by about 1kbyte on an x86 system): -# option FLOATING_ARITHMETIC on - -option FLOATING_ARITHMETIC off - -# Your program will probably need other options. The example -# program here, pngm2pnm, requires the following. Take a look -# at pnglibconf.h to find out the full set of what has to be -# enabled to make the following work. - -option SETJMP on -option STDIO on -option READ_EXPAND on -option READ_16_TO_8 on diff --git a/libpng/contrib/pngminim/decoder/pngusr.h b/libpng/contrib/pngminim/decoder/pngusr.h deleted file mode 100644 index ce85537..0000000 --- a/libpng/contrib/pngminim/decoder/pngusr.h +++ /dev/null @@ -1,23 +0,0 @@ -/* minrdpngconf.h: headers to make a minimal png-read-only library - * - * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - * - * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson - */ - -#ifndef MINRDPNGCONF_H -#define MINRDPNGCONF_H - -/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */ - -/* List options to turn off features of the build that do not - * affect the API (so are not recorded in pnglibconf.h) - */ - -#define PNG_NO_WARNINGS - -#endif /* MINRDPNGCONF_H */ -- cgit v1.1