diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-13 13:35:51 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-13 13:35:51 +0300 |
| commit | 2760d6fd87cee9ced73b8468f99a63be07fda60a (patch) | |
| tree | c746f1664d84196e7a643ee95bae461dafe17dc6 /example | |
| parent | afc40f3dc122df5a79bdd9464ee1b4a6bba3df46 (diff) | |
| parent | 4cdf96d25cf2a1a66e89d5ad2cff72306651e4ad (diff) | |
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Conflicts:
platform/linux-generic/Makefile.am
Diffstat (limited to 'example')
| -rw-r--r-- | example/Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/example/Makefile.inc b/example/Makefile.inc index b3a9706..e1c1cb7 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,7 +1,7 @@ include $(top_srcdir)/Makefile.inc include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp.la +LDADD = $(LIB)/libodp.la $(LIB)/libodphelper.la AM_CFLAGS += \ -I$(srcdir) \ -I$(top_srcdir)/example \ |