diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-03-28 16:40:33 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-03-28 16:40:33 +0200 |
| commit | 3e6ac628e274b535650a6ae4577cbca8940ad773 (patch) | |
| tree | 20d70353cd18ec157007ef7ab1985f516cf275b6 | |
| parent | d7321e950c1eb5a0a6c029e84863c364af01bb0e (diff) | |
Synthesis SDK: explicitly define dependency on libsmltk
libsynthesissdk calls libsmltk directly (in san.cpp). libsmltk used to
be provided via libsynthesis, but only if really linked (not always
the case, for example when using the SDK in "open engine dynamically"
mode) and indirect linking stopped working with more recent Linux
bintools which enforce that all libraries are properly declared.
This patch fixes this both in libtool linking (.la files, LIBADD) and
pkg-config definition files (.pc files).
| -rw-r--r-- | src/Makefile.am.in | 1 | ||||
| -rw-r--r-- | synthesis-sdk.pc.in | 2 | ||||
| -rw-r--r-- | synthesis.pc.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am.in b/src/Makefile.am.in index 7e5b245..1bd1f3a 100644 --- a/src/Makefile.am.in +++ b/src/Makefile.am.in @@ -107,6 +107,7 @@ else XMLPARSE_CFLAGS_BUILTIN = -I$(srcdir)/Targets/ReleasedProducts/clientEngine_autotools/systemxml endif +libsynthesissdk_la_LIBADD = libsmltk.la # san.cpp calls sml* functions directly libsynthesissdk_la_LDFLAGS = -static libsynthesissdk_la_CFLAGS = $(PIC_CXXFLAGS) libsynthesissdk_la_CXXFLAGS = $(PIC_CXXFLAGS) diff --git a/synthesis-sdk.pc.in b/synthesis-sdk.pc.in index 98f360a..8bb443b 100644 --- a/synthesis-sdk.pc.in +++ b/synthesis-sdk.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: synthesis Description: Synthesis SyncML SDK Version: @VERSION@ -Libs: -L${libdir} -lsynthesissdk -lsynthesisstubs +Libs: -L${libdir} -lsynthesissdk -lsmltk -lsynthesisstubs Cflags: -I${includedir} diff --git a/synthesis.pc.in b/synthesis.pc.in index 03a93e7..383349b 100644 --- a/synthesis.pc.in +++ b/synthesis.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: synthesis Description: Synthesis SyncML SDK, Client and Server Engine Version: @VERSION@ -Libs: -L${libdir} -lsynthesissdk -lsynthesis +Libs: -L${libdir} -lsynthesissdk -lsmltk -lsynthesis Cflags: -I${includedir} |