From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 1 Oct 2008 14:55:50 +0000 (+0000)
Subject: Use AM_CPPFLAGS to avoid per-target flags, to avoid AM_PROG_CC_C_O.
X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~202
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7fca766cc8210aefcc702abfcda9453aab350a;p=yubikey-personalization.old

Use AM_CPPFLAGS to avoid per-target flags, to avoid AM_PROG_CC_C_O.
---

diff --git a/Makefile.am b/Makefile.am
index a361ebf..5d2523e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,8 @@
 
 SUBDIRS=@subdirs@
 
+AM_CPPFLAGS = -I./yubikey-core -I./rfc4634
+
 # The library.
 
 lib_LTLIBRARIES = libykpers.la
@@ -40,7 +42,6 @@ libykpers_la_SOURCES = ykpers.h ykpers.c ykpbkdf2.h ykpbkdf2.c \
 	rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h \
 	rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c
 libykpers_la_LIBADD = ./yubikey-core/libykcore.a -lusb
-libykpers_la_CFLAGS = -I./yubikey-core -I./rfc4634
 libykpers_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
@@ -49,7 +50,6 @@ libykpers_la_LDFLAGS = -no-undefined \
 bin_PROGRAMS = ykpersonalize
 
 ykpersonalize_SOURCES = ykpersonalize.c
-ykpersonalize_CFLAGS = -I./yubikey-core
 ykpersonalize_LDADD = ./libykpers.la
 
 # Self tests.