Remember to use the CFLAGS pkg-config gave us.

This commit is contained in:
Dag-Erling Smørgrav 2017-03-07 16:20:23 +01:00
parent 27ec6108ea
commit e6f26116a2
6 changed files with 32 additions and 2 deletions

View file

@ -1,8 +1,16 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
libotp = $(top_builddir)/lib/otp/libcryb-otp.la
bin_PROGRAMS = otpkey bin_PROGRAMS = otpkey
otpkey_SOURCES = otpkey.c otpkey_SOURCES = otpkey.c
otpkey_CFLAGS = \
$(CRYB_CORE_CFLAGS)
otpkey_LDADD = $(libotp)
dist_man1_MANS = otpkey.1 dist_man1_MANS = otpkey.1
if WITH_SETUID if WITH_SETUID

View file

@ -6,6 +6,10 @@ libcryb_otp_la_SOURCES = \
\ \
cryb_otp.c cryb_otp.c
libcryb_otp_la_CFLAGS = \
$(CRYB_CORE_CFLAGS) \
$(CRYB_OATH_CFLAGS)
libcryb_otp_la_LIBADD = \ libcryb_otp_la_LIBADD = \
$(CRYB_CORE_LIBS) \ $(CRYB_CORE_LIBS) \
$(CRYB_OATH_LIBS) $(CRYB_OATH_LIBS)

View file

@ -5,6 +5,10 @@ libotp = $(top_builddir)/lib/otp/libcryb-otp.la
libexec_PROGRAMS = login_otp libexec_PROGRAMS = login_otp
login_otp_SOURCES = login_otp.c login_otp_SOURCES = login_otp.c
login_otp_CFLAGS = \
$(CRYB_CORE_CFLAGS)
login_otp_LDADD = $(libotp) login_otp_LDADD = $(libotp)
dist_man8_MANS = login_otp.8 dist_man8_MANS = login_otp.8

View file

@ -6,9 +6,15 @@ moduledir = $(libdir)
module_LTLIBRARIES = pam_otp.la module_LTLIBRARIES = pam_otp.la
pam_otp_la_SOURCES = pam_otp.c pam_otp_la_SOURCES = pam_otp.c
pam_otp_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
pam_otp_la_LIBADD = \ pam_otp_la_LIBADD = \
$(libotp) \ $(libotp) \
$(PAM_LIBS) $(PAM_LIBS)
pam_otp_la_LDFLAGS = -no-undefined -module -export-symbols-regex '^pam_sm_'
pam_otp_la_LDFLAGS = \
-no-undefined -module -export-symbols-regex '^pam_sm_'
dist_man8_MANS = pam_otp.8 dist_man8_MANS = pam_otp.8

View file

@ -1,6 +1,14 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
libotp = $(top_builddir)/lib/otp/libcryb-otp.la
sbin_PROGRAMS = otpradiusd sbin_PROGRAMS = otpradiusd
otpradiusd_SOURCES = otpradiusd.c otpradiusd_SOURCES = otpradiusd.c
otpradiusd_CFLAGS = \
$(CRYB_CORE_CFLAGS)
otpradiusd_LDADD = $(libotp)
dist_man8_MANS = otpradiusd.8 dist_man8_MANS = otpradiusd.8

View file

@ -12,7 +12,7 @@ TESTS =
# c++ header test # c++ header test
TESTS += t_cxx TESTS += t_cxx
t_cxx_SOURCES = t_cxx.cc t_cxx_SOURCES = t_cxx.cc
t_cxx_CPPFLAGS = $(AM_CPPFLAGS) t_cxx_CPPFLAGS = $(AM_CPPFLAGS) $(CRYB_CORE_CFLAGS)
t_cxx_LDADD = t_cxx_LDADD =
if OTP_LIB if OTP_LIB
t_cxx_CPPFLAGS += -DWITH_OTP_LIB t_cxx_CPPFLAGS += -DWITH_OTP_LIB