diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-01-20 21:44:49 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-21 07:42:34 +0000 |
| commit | ed413e9fe4daf36a1c08b1c095752fd8c6a4ec84 (patch) | |
| tree | c6a248550e3c7d56cb600eadcd867d08f8e2f8e4 /Makefile.am | |
| parent | 46fabdcdf318f70442ff01d919355ca76bcb686d (diff) | |
| download | wireshark-ed413e9fe4daf36a1c08b1c095752fd8c6a4ec84.tar.gz | |
Link only the GUIs with SBC (if we have SBC). The other programs don't
(yet) use libcodec.
Also, there's no need to explicitly call pkg-config to get SBC's
CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.
Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
Reviewed-on: https://code.wireshark.org/review/6700
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 897d9a7255..976591bcef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -416,6 +416,7 @@ wireshark_common_ldadd = \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ \ + @SBC_LIBS@ \ @GLIB_LIBS@ if HAVE_Qt @@ -644,7 +645,7 @@ dumpcap_LDFLAGS = $(PIE_LDFLAGS) # Common headers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \ - @LUA_INCLUDES@ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" + @LUA_INCLUDES@ $(SBC_CFLAGS) -DTOP_SRCDIR=\"$(abs_top_srcdir)\" # # Build the version string |