diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 17:46:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 17:46:47 +0000 |
| commit | 0ae84fe7596906341cafa0dfe20f367e4cbf8385 (patch) | |
| tree | 0261e4dcb816dc7e5ae3047a420ed6a5fed4332e /krdc | |
| parent | fa8a6a4aa1313667249adc0fd8eaac368c23903a (diff) | |
| download | tdenetwork-0ae84fe7596906341cafa0dfe20f367e4cbf8385.tar.gz tdenetwork-0ae84fe7596906341cafa0dfe20f367e4cbf8385.zip | |
Fix kdenetwork FTBFS under oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1258244 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krdc')
| -rw-r--r-- | krdc/Makefile.am | 4 | ||||
| -rw-r--r-- | krdc/vnc/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/krdc/Makefile.am b/krdc/Makefile.am index bf24d823..69d76eec 100644 --- a/krdc/Makefile.am +++ b/krdc/Makefile.am @@ -23,8 +23,8 @@ appdata_DATA = pointcursor.png pointcursormask.png pinup.png pindown.png \ dnssddatadir = $(kde_datadir)/zeroconf dnssddata_DATA = _rfb._tcp -krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_KDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) +krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_KDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -lDCOP +krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) xdg_apps_DATA = krdc.desktop diff --git a/krdc/vnc/Makefile.am b/krdc/vnc/Makefile.am index 23956297..a8e93285 100644 --- a/krdc/vnc/Makefile.am +++ b/krdc/vnc/Makefile.am @@ -11,6 +11,6 @@ noinst_HEADERS = kvncview.h rfbproto.h vncviewer.h vnctypes.h vncauth.h \ pointerlatencyometer.h threads.h d3des.h vnchostpref.h libvnc_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG) -libvnc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libvnc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lz INCLUDES= -I$(top_srcdir)/krdc -I.. $(all_includes) |