[master] Revised Makefile.am and Makefile.in to remove references to Y2KINFO,

KNOWNBUG, and libpng.la (Robert Schwebel).
This commit is contained in:
Glenn Randers-Pehrson 2010-01-04 06:26:41 -06:00
parent e16f2bc5f7
commit 2203e41900
4 changed files with 10 additions and 12 deletions

View File

@ -29,6 +29,8 @@ Changes since the last public release (1.4.0):
version 1.4.1beta01 [January 4, 2010] version 1.4.1beta01 [January 4, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman). unclosed if-statement warning (Philip Lowman).
Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
KNOWNBUG, and libpng.la (Robert Schwebel).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -2461,6 +2461,8 @@ version 1.4.0 [January 3, 2010]
version 1.4.1beta01 [January 4, 2010] version 1.4.1beta01 [January 4, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman). unclosed if-statement warning (Philip Lowman).
Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
KNOWNBUG, and libpng.la (Robert Schwebel).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -30,7 +30,7 @@ bin_SCRIPTS= @binconfigs@
# rules to build libpng, only build the old library on request # rules to build libpng, only build the old library on request
lib_LTLIBRARIES=libpng14.la lib_LTLIBRARIES=libpng14.la
EXTRA_LTLIBRARIES= libpng.la # EXTRA_LTLIBRARIES= libpng.la
libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \ libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \
pngtrans.c pngwutil.c \ pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
@ -67,7 +67,7 @@ pkgconfig_DATA = libpng14.pc
#extra source distribution files. #extra source distribution files.
EXTRA_DIST= \ EXTRA_DIST= \
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ ANNOUNCE CHANGES INSTALL LICENSE README TODO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/cbuilder5/* \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \

View File

@ -91,9 +91,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libpng_la_LIBADD =
libpng_la_SOURCES = libpng.c
libpng_la_OBJECTS = libpng.lo
libpng14_la_LIBADD = libpng14_la_LIBADD =
am_libpng14_la_OBJECTS = libpng14_la-png.lo libpng14_la-pngset.lo \ am_libpng14_la_OBJECTS = libpng14_la-png.lo libpng14_la-pngset.lo \
libpng14_la-pngget.lo libpng14_la-pngrutil.lo \ libpng14_la-pngget.lo libpng14_la-pngrutil.lo \
@ -124,8 +121,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
SOURCES = libpng.c $(libpng14_la_SOURCES) $(pngtest_SOURCES) SOURCES = $(libpng14_la_SOURCES) $(pngtest_SOURCES)
DIST_SOURCES = libpng.c $(libpng14_la_SOURCES) $(pngtest_SOURCES) DIST_SOURCES = $(libpng14_la_SOURCES) $(pngtest_SOURCES)
man3dir = $(mandir)/man3 man3dir = $(mandir)/man3
man5dir = $(mandir)/man5 man5dir = $(mandir)/man5
NROFF = nroff NROFF = nroff
@ -294,7 +291,7 @@ bin_SCRIPTS = @binconfigs@
# rules to build libpng, only build the old library on request # rules to build libpng, only build the old library on request
lib_LTLIBRARIES = libpng14.la lib_LTLIBRARIES = libpng14.la
EXTRA_LTLIBRARIES = libpng.la # EXTRA_LTLIBRARIES= libpng.la
libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \ libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \
pngtrans.c pngwutil.c \ pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
@ -316,7 +313,7 @@ pkgconfig_DATA = libpng14.pc
#extra source distribution files. #extra source distribution files.
EXTRA_DIST = \ EXTRA_DIST = \
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ ANNOUNCE CHANGES INSTALL LICENSE README TODO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/cbuilder5/* \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \
@ -428,8 +425,6 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libpng.la: $(libpng_la_OBJECTS) $(libpng_la_DEPENDENCIES)
$(LINK) $(libpng_la_OBJECTS) $(libpng_la_LIBADD) $(LIBS)
libpng14.la: $(libpng14_la_OBJECTS) $(libpng14_la_DEPENDENCIES) libpng14.la: $(libpng14_la_OBJECTS) $(libpng14_la_DEPENDENCIES)
$(libpng14_la_LINK) -rpath $(libdir) $(libpng14_la_OBJECTS) $(libpng14_la_LIBADD) $(LIBS) $(libpng14_la_LINK) -rpath $(libdir) $(libpng14_la_OBJECTS) $(libpng14_la_LIBADD) $(LIBS)
@ -485,7 +480,6 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-png.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-png.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-pngerror.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-pngerror.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-pngget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpng14_la-pngget.Plo@am__quote@