small cleanups in Makefile.am

This commit is contained in:
Tim Ruehsen 2014-03-24 20:54:34 +01:00
parent 8b096a5eda
commit 2ec5dc7567
2 changed files with 0 additions and 10 deletions

View File

@ -6,8 +6,6 @@ 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
# build two libraries, 'inline' version with PSL entries compiled in
#lib_LTLIBRARIES = libpsl-@LIBPSL_API_VERSION@.la libpsl-inline-@LIBPSL_API_VERSION@.la
lib_LTLIBRARIES = libpsl-@LIBPSL_API_VERSION@.la lib_LTLIBRARIES = libpsl-@LIBPSL_API_VERSION@.la
libpsl_@LIBPSL_API_VERSION@_la_SOURCES = psl.c libpsl_@LIBPSL_API_VERSION@_la_SOURCES = psl.c
@ -15,16 +13,10 @@ libpsl_@LIBPSL_API_VERSION@_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_@LIBPSL_API_VERSION@_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
#libpsl_inline_@LIBPSL_API_VERSION@_la_SOURCES = psl-inline.c
#libpsl_inline_@LIBPSL_API_VERSION@_la_CPPFLAGS = -I$(top_srcdir)/include
# include ABI version information
#libpsl_inline_@LIBPSL_API_VERSION@_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
noinst_PROGRAMS = psl2c noinst_PROGRAMS = psl2c
psl2c_SOURCES = psl2c.c psl2c_SOURCES = psl2c.c
psl2c_CPPFLAGS = -I$(top_srcdir)/include -D _GNU_SOURCE psl2c_CPPFLAGS = -I$(top_srcdir)/include -D _GNU_SOURCE
#psl2c_LDADD = -lidn2 #psl2c_LDADD = -lidn2
#psl2c_LDFLAGS = -static
# Build rule for suffix.c # Build rule for suffix.c
suffixes.c: $(top_srcdir)/data/effective_tld_names.dat psl2c$(EXEEXT) suffixes.c: $(top_srcdir)/data/effective_tld_names.dat psl2c$(EXEEXT)

View File

@ -1,7 +1,5 @@
#DEFS = @DEFS@ -DDATADIR=\"$(datadir)/@PACKAGE@\" -DSRCDIR=\"$(srcdir)\"
DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\" DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\"
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
#AM_LDFLAGS = -static
LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la
PSL_TESTS = test-is-public test-is-public-builtin PSL_TESTS = test-is-public test-is-public-builtin