Properly support LTLIBINTL setting in Makefiles.

Fixes #479.
This commit is contained in:
Milan Broz
2019-10-08 15:26:13 +02:00
parent ca2f5a8160
commit 99c4e83994
3 changed files with 8 additions and 6 deletions

View File

@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
AM_CFLAGS = -Wall
AM_LDFLAGS =
LDADD = $(LTLIBINTL) -lm
tmpfilesddir = @DEFAULT_TMPFILESDIR@
noinst_LTLIBRARIES =

View File

@@ -13,7 +13,7 @@ cryptsetup_SOURCES = \
src/cryptsetup.c \
src/cryptsetup.h
cryptsetup_LDADD = -lm \
cryptsetup_LDADD = $(LDADD) \
libcryptsetup.la \
@POPT_LIBS@ \
@PWQUALITY_LIBS@ \
@@ -47,7 +47,7 @@ veritysetup_SOURCES = \
src/veritysetup.c \
src/cryptsetup.h
veritysetup_LDADD = -lm \
veritysetup_LDADD = $(LDADD) \
libcryptsetup.la \
@POPT_LIBS@ \
@BLKID_LIBS@
@@ -78,7 +78,7 @@ integritysetup_SOURCES = \
src/integritysetup.c \
src/cryptsetup.h
integritysetup_LDADD = -lm \
integritysetup_LDADD = $(LDADD) \
libcryptsetup.la \
@POPT_LIBS@ \
@UUID_LIBS@ \
@@ -110,7 +110,7 @@ cryptsetup_reencrypt_SOURCES = \
src/cryptsetup_reencrypt.c \
src/cryptsetup.h
cryptsetup_reencrypt_LDADD = -lm \
cryptsetup_reencrypt_LDADD = $(LDADD) \
libcryptsetup.la \
@POPT_LIBS@ \
@PWQUALITY_LIBS@ \

View File

@@ -77,13 +77,13 @@ differ_SOURCES = differ.c
differ_CFLAGS = $(AM_CFLAGS) -Wall -O2
api_test_SOURCES = api-test.c api_test.h test_utils.c
api_test_LDADD = ../libcryptsetup.la
api_test_LDADD = $(LDADD) ../libcryptsetup.la
api_test_LDFLAGS = $(AM_LDFLAGS) -static
api_test_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1
api_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
api_test_2_SOURCES = api-test-2.c api_test.h test_utils.c
api_test_2_LDADD = ../libcryptsetup.la
api_test_2_LDADD = $(LDADD) ../libcryptsetup.la
api_test_2_LDFLAGS = $(AM_LDFLAGS) -static
api_test_2_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1
api_test_2_CPPFLAGS = $(AM_CPPFLAGS) -include config.h