walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

remove LIBPSL_API_VERSION for simplicity

This commit is contained in:
Daniel Kahn Gillmor 2014-05-31 18:56:07 +02:00 committed by Tim Ruehsen
parent 57b53c990c
commit cadb963475
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -11,6 +11,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
## pkg-config files are also used for architecture-independent data packages, ## pkg-config files are also used for architecture-independent data packages,
## in which case the correct install location would be $(datadir)/pkgconfig. ## in which case the correct install location would be $(datadir)/pkgconfig.
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpsl-$(LIBPSL_API_VERSION).pc pkgconfig_DATA = libpsl.pc
EXTRA_DIST = config.rpath EXTRA_DIST = config.rpath

4
configure.ac
View File

@ -64,7 +64,7 @@ AS_IF([ test "$enable_man" != no ], [
# 5. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any interfaces have been removed or changed since the last public release, then set age to 0. # 6. If any interfaces have been removed or changed since the last public release, then set age to 0.
AC_SUBST([LIBPSL_SO_VERSION], [0:4:0]) AC_SUBST([LIBPSL_SO_VERSION], [0:4:0])
AC_SUBST([LIBPSL_API_VERSION], [0.2]) AC_SUBST([LIBPSL_VERSION], $VERSION)
# Check for idn2 # Check for idn2
AC_CHECK_PROG(HAVE_IDN2, idn2, yes, AC_MSG_ERROR(Cannot find required tool 'idn2'.)) AC_CHECK_PROG(HAVE_IDN2, idn2, yes, AC_MSG_ERROR(Cannot find required tool 'idn2'.))
@ -126,7 +126,7 @@ AC_CONFIG_FILES([Makefile
docs/libpsl/version.xml docs/libpsl/version.xml
data/Makefile data/Makefile
tests/Makefile tests/Makefile
libpsl-${LIBPSL_API_VERSION}.pc:libpsl.pc.in]) libpsl.pc:libpsl.pc.in])
AC_OUTPUT AC_OUTPUT
AC_MSG_NOTICE([Summary of build options: AC_MSG_NOTICE([Summary of build options:

2
docs/libpsl/version.xml.in
View File

@ -1 +1 @@
@LIBPSL_API_VERSION@ @LIBPSL_VERSION@

4
libpsl.pc.in
View File

@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Description: Publix Suffix List C library. Description: Publix Suffix List C library.
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@ URL: @PACKAGE_URL@
Libs: -L${libdir} -llibpsl-@LIBPSL_API_VERSION@ Libs: -L${libdir} -llibpsl
Cflags: -I${includedir}/libpsl-@LIBPSL_API_VERSION@ -I${libdir}/libpsl-@LIBPSL_API_VERSION@/include Cflags: -I${includedir}/libpsl -I${libdir}/libpsl/include

8
src/Makefile.am
View File

@ -4,12 +4,12 @@ BUILT_SOURCES = suffixes.c
# suffixes.c is a built source that must be cleaned # suffixes.c is a built source that must be cleaned
CLEANFILES = suffixes.c CLEANFILES = suffixes.c
lib_LTLIBRARIES = libpsl-@LIBPSL_API_VERSION@.la lib_LTLIBRARIES = libpsl.la
libpsl_@LIBPSL_API_VERSION@_la_SOURCES = psl.c libpsl_la_SOURCES = psl.c
libpsl_@LIBPSL_API_VERSION@_la_CPPFLAGS = -I$(top_srcdir)/include libpsl_la_CPPFLAGS = -I$(top_srcdir)/include
# include ABI version information # include ABI version information
libpsl_@LIBPSL_API_VERSION@_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION) libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
noinst_PROGRAMS = psl2c noinst_PROGRAMS = psl2c
psl2c_SOURCES = psl2c.c psl2c_SOURCES = psl2c.c

2
tests/Makefile.am
View File

@ -1,6 +1,6 @@
DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\" -DPSL_FILE=\"$(PSL_FILE)\" -DPSL_TESTFILE=\"$(PSL_TESTFILE)\" DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\" -DPSL_FILE=\"$(PSL_FILE)\" -DPSL_TESTFILE=\"$(PSL_TESTFILE)\"
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la LDADD = ../src/libpsl.la
if WITH_BUILTIN if WITH_BUILTIN

2
tools/Makefile.am
View File

@ -2,4 +2,4 @@ bin_PROGRAMS = psl
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_LDFLAGS = -static AM_LDFLAGS = -static
LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la LDADD = ../src/libpsl.la