lib/process: Add process_get_stdout

[petitboot] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6b1d82bf80c3702d9a74aabc515c318e8ba5411d..0088e0bf5d14d0a52887fdd2a4aea9a5c2b9981b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,16 +18,23 @@ 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 \
        lib/file/file.h \
        lib/file/file.c \
        lib/fold/fold.h \
@@ -58,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