lib/libpng
1
0
Fork 0
mirror of https://github.com/glennrp/libpng.git synced 2025-04-19 08:22:16 +03:00
Code

build: Move scripts/*.m4 to scripts/autoconf/

Browse Source 
Move all Autoconf macro files (except for those that need to be in
the top-level directory) to their own subdirectory scripts/autoconf/

In this commit, we introduce a better way to organize the scripts dir,
and we make a better separation between the build scripts under the
libpng license vs. the build scripts that fall under other licenses.

Please see scripts/autoconf/README.md for more information.
This commit is contained in:
Cosmin Truta 2024-01-22 15:16:10 +02:00
parent 438a518611
commit 671661849a
11 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,6 +1,6 @@
# Makefile.am, the source file for Makefile.in (and hence Makefile), is
#
# Copyright (c) 2018-2023 Cosmin Truta
# Copyright (c) 2018-2024 Cosmin Truta
# Copyright (c) 2004-2016 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
@ -9,7 +9,7 @@
PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
ACLOCAL_AMFLAGS = -I scripts
ACLOCAL_AMFLAGS = -I scripts/autoconf
# test programs - run on make check, make distcheck
if ENABLE_TESTS
@ -183,7 +183,7 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
EXTRA_DIST= \
ANNOUNCE AUTHORS CHANGES INSTALL LICENSE README TODO TRADEMARK \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
${srcdir}/ci ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
$(TESTS) $(XFAIL_TESTS) tests/pngstest \
CMakeLists.txt example.c libpng-manual.txt

16
Makefile.in
View File

@ -16,7 +16,7 @@
# Makefile.am, the source file for Makefile.in (and hence Makefile), is
#
# Copyright (c) 2018-2023 Cosmin Truta
# Copyright (c) 2018-2024 Cosmin Truta
# Copyright (c) 2004-2016 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
@ -132,11 +132,11 @@ host_triplet = @host@
@DO_PNG_PREFIX_TRUE@am__append_12 = -DPNG_PREFIX='@PNG_PREFIX@'
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/scripts/libtool.m4 \
$(top_srcdir)/scripts/ltoptions.m4 \
$(top_srcdir)/scripts/ltsugar.m4 \
$(top_srcdir)/scripts/ltversion.m4 \
$(top_srcdir)/scripts/lt~obsolete.m4 \
am__aclocal_m4_deps = $(top_srcdir)/scripts/autoconf/libtool.m4 \
$(top_srcdir)/scripts/autoconf/ltoptions.m4 \
$(top_srcdir)/scripts/autoconf/ltsugar.m4 \
$(top_srcdir)/scripts/autoconf/ltversion.m4 \
$(top_srcdir)/scripts/autoconf/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -760,7 +760,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
ACLOCAL_AMFLAGS = -I scripts
ACLOCAL_AMFLAGS = -I scripts/autoconf
# This ensures that pnglibconf.h gets built at the start of 'make all' or
# 'make check', but it does not add dependencies to the individual programs,
@ -851,7 +851,7 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
EXTRA_DIST = \
ANNOUNCE AUTHORS CHANGES INSTALL LICENSE README TODO TRADEMARK \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
${srcdir}/ci ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
$(TESTS) $(XFAIL_TESTS) tests/pngstest \
CMakeLists.txt example.c libpng-manual.txt

10
aclocal.m4 vendored
View File

@ -1204,8 +1204,8 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([scripts/libtool.m4])
m4_include([scripts/ltoptions.m4])
m4_include([scripts/ltsugar.m4])
m4_include([scripts/ltversion.m4])
m4_include([scripts/lt~obsolete.m4])
m4_include([scripts/autoconf/libtool.m4])
m4_include([scripts/autoconf/ltoptions.m4])
m4_include([scripts/autoconf/ltsugar.m4])
m4_include([scripts/autoconf/ltversion.m4])
m4_include([scripts/autoconf/lt~obsolete.m4])

5
autogen.sh
View File

@ -82,8 +82,9 @@ libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in
libpng_autotools_extra="compile config.h.in~"
#
# These are separate because 'maintainer-clean' does not remove them.
libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\
scripts/ltsugar.m4 scripts/ltversion.m4 scripts/lt~obsolete.m4"
libpng_libtool_files="scripts/autoconf/libtool.m4 scripts/autoconf/ltoptions.m4\
scripts/autoconf/ltsugar.m4 scripts/autoconf/ltversion.m4\
scripts/autoconf/lt~obsolete.m4"
libpng_autotools_dirs="autom4te.cache" # not required
#

4
configure.ac
View File

@ -1,6 +1,6 @@
# configure.ac
# Copyright (c) 2018-2023 Cosmin Truta
# Copyright (c) 2018-2024 Cosmin Truta
# Copyright (c) 2004-2016 Glenn Randers-Pehrson
# This code is released under the libpng license.
@ -26,7 +26,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
AC_INIT([libpng],[1.6.41.git],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
AC_CONFIG_MACRO_DIR([scripts/autoconf])
# libpng does not follow GNU file name conventions (hence 'foreign')
# color-tests requires automake 1.11 or later

7
scripts/autoconf/README.md Normal file
View File

@ -0,0 +1,7 @@
Autoconf Macro Files for the PNG Reference Library
==================================================
The Autoconf files associated with libpng are free software.
Use, modification and distribution of each individual file
are subject to the specific licensing terms and conditions
stated at the top of the file.

0
scripts/libtool.m4 → scripts/autoconf/libtool.m4 vendored
View File

0
scripts/ltoptions.m4 → scripts/autoconf/ltoptions.m4 vendored
View File

0
scripts/ltsugar.m4 → scripts/autoconf/ltsugar.m4 vendored
View File

0
scripts/ltversion.m4 → scripts/autoconf/ltversion.m4 vendored
View File

0
scripts/lt~obsolete.m4 → scripts/autoconf/lt~obsolete.m4 vendored
View File