X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2FMakefile.am;fp=lib%2FMakefile.am;h=0088e0bf5d14d0a52887fdd2a4aea9a5c2b9981b;hp=8f682021d45ad898cd04785a0ec533c05816f75d;hb=8b214b9d1c51f49d977e93b66378ed4f73790c8b;hpb=b1234ac9dd09c9ceaf929c9d4d738fd556525291

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8f68202..0088e0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,14 +18,20 @@ noinst_LTLIBRARIES += $(core_lib)
 
 lib_libpbcore_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-DPREFIX='"$(prefix)"'
+	-DPREFIX='"$(prefix)"' \
+	$(OPENSSL_INCLUDES)
 
-if WITH_GPGME
-gpg_int_SOURCES = lib/security/gpg.h \
-	lib/security/gpg.c
-else
-gpg_int_SOURCES =
-endif
+lib_libpbcore_la_LIBADD = \
+	$(GPGME_LIBS) \
+	$(OPENSSL_LIBS)
+
+lib_libpbcore_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	$(OPENSSL_LDFLAGS)
+
+lib_libpbcore_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GPGME_CFLAGS)
 
 lib_libpbcore_la_SOURCES = \
 	lib/ccan/endian/endian.h \
@@ -59,19 +65,27 @@ lib_libpbcore_la_SOURCES = \
 	lib/util/util.h \
 	lib/flash/config.h \
 	lib/flash/flash.h \
-	$(gpg_int_SOURCES)
+	lib/security/security.h
 
 if ENABLE_MTD
 lib_libpbcore_la_SOURCES += \
 	lib/flash/flash.c
 
-lib_libpbcore_la_CPPFLAGS += \
-	$(AM_CPPFLAGS)
-
-lib_libpbcore_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
+lib_libpbcore_la_LDFLAGS += \
 	$(LIBFLASH_LIBS)
+endif
 
+if WITH_GPGME
 lib_libpbcore_la_SOURCES += \
-	lib/flash/flash.c
+	lib/security/common.c \
+	lib/security/gpg.c
+else
+if WITH_OPENSSL
+lib_libpbcore_la_SOURCES += \
+	lib/security/common.c \
+	lib/security/openssl.c
+else
+lib_libpbcore_la_SOURCES += \
+	lib/security/none.c
+endif
 endif