← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdelibs/oneiric

« back to all changes in this revision

Viewing changes to kio/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 19:20:42 UTC
  • mfrom: (1.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015192042-jv1fhj33n4f5b398
Tags: 4:3.5.10.dfsg.1-5ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - make sure control and control.in are in sync
  - --with-distribution="Kubuntu (`lsb_release --codename --short`)
    $(DEB_VERSION)"
  - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and
    cr*-device-system.png.uu
  - don't build-dep on libgamin-dev, libfam-dev
  - stop kdelibs4-dev depending on gamin/fam
  - don't install .svgz icons, docs or all_languages in kdelibs-data.install
  - rosetta support in rules common-install-prehook-impl:: [and
    common-post-build-arch:: ?] and include debian/kubuntu-desktop-i18n/
  - build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
  - cdbs build-dep 0.4.41ubuntu2
  - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
  - copy debian/icons over
  - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on
    xdg-user-dirs
  - Remove 19_debianize_useragent.diff (changed to
    kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
  - remove kdelibs4c2a depends on menu-xdg
  - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
  - use a local copy of kde.mk without the common-install-prehook-impl::
    rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
  - build with --with-sudo-kdesu-backend and build-dep on sudo and make
    kdelibs4c2a depend on sudo
  - kdelibs-data.install : Add nzb mimetype
  - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
  - remove /usr/bin/preparetips, arts files and ksvntopng from
    kdelibs4-dev.install
  - Drop the package kdelibs4-doc completely. It contained API documentation
    which is now obsolete, but still available via api.kde.org.
  - make sure control and control.in are in sync
  - in debian/rule remove .pot files outside .po directory
  - 97_automake_cleanup.diff becomes kubuntu_97_automake_cleanup.diff
  - Remove libarts1-dev from build-depends and kdelibs4-dev depends from
    control.in
* Drop kubuntu_98_fix_khc_invocation.diff, replaced by
  68_support_khelpcenter4.diff
* Drop kubuntu_97_automake_cleanup.diff, replaced by 97_automake_cleanup.diff
* Re-add security_05_XMLHttpRequest_vulnerability.diff which has been
  accidentally dropped
* Fix FTBFS, in debian/rules:
  - Add -Wl,--add-needed to LDFLAGS
  - Disable parallel building

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/Makefile.in
87
87
        ../kdeui/libkdeui.la ../kdesu/libkdesu.la \
88
88
        ../kwallet/client/libkwalletclient.la $(am__DEPENDENCIES_1) \
89
89
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 
90
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 
91
        $(am__DEPENDENCIES_1) $(top_builddir)/dcop/libDCOP.la \
90
92
        $(am__DEPENDENCIES_1)
91
93
am_libkio_la_OBJECTS = dummy.lo
92
94
#>- libkio_la_OBJECTS = $(am_libkio_la_OBJECTS)
153
155
  distclean-recursive maintainer-clean-recursive
154
156
ETAGS = etags
155
157
CTAGS = ctags
156
 
DIST_SUBDIRS = $(SUBDIRS)
157
158
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
158
159
#>+ 1
159
160
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
167
168
AUTODIRS = @AUTODIRS@
168
169
AUTOHEADER = @AUTOHEADER@
169
170
AUTOMAKE = @AUTOMAKE@
 
171
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
172
AVAHI_LIBS = @AVAHI_LIBS@
170
173
AWK = @AWK@
171
174
CC = @CC@
172
175
CCDEPMODE = @CCDEPMODE@
188
191
DOXYGEN = @DOXYGEN@
189
192
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
190
193
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
194
DSYMUTIL = @DSYMUTIL@
191
195
ECHO = @ECHO@
192
196
ECHO_C = @ECHO_C@
193
197
ECHO_N = @ECHO_N@
281
285
LIBXSLT_RPATH = @LIBXSLT_RPATH@
282
286
LIBZ = @LIBZ@
283
287
LIB_CUPS = @LIB_CUPS@
284
 
LIB_DNSSD = @LIB_DNSSD@
285
288
LIB_EXR = @LIB_EXR@
286
289
LIB_IDN = @LIB_IDN@
287
290
LIB_JASPER = @LIB_JASPER@
309
312
LIB_POLL = @LIB_POLL@
310
313
LIB_QPE = @LIB_QPE@
311
314
LIB_QT = @LIB_QT@
 
315
LIB_QT_EXT = @LIB_QT_EXT@
312
316
LIB_SMB = @LIB_SMB@
313
317
LIB_X11 = @LIB_X11@
314
318
LIB_XEXT = @LIB_XEXT@
318
322
LUA = @LUA@
319
323
LUA_INCLUDES = @LUA_INCLUDES@
320
324
LUA_LIBS = @LUA_LIBS@
 
325
MAINT = @MAINT@
321
326
MAKEINFO = @MAKEINFO@
322
327
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
323
328
MCOPIDL = @MCOPIDL@
327
332
MKDIR_P = @MKDIR_P@
328
333
MOC = @MOC@
329
334
MSGFMT = @MSGFMT@
 
335
NMEDIT = @NMEDIT@
330
336
NOOPT_CFLAGS = @NOOPT_CFLAGS@
331
337
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
332
338
OBJEXT = @OBJEXT@
346
352
QT_INCLUDES = @QT_INCLUDES@
347
353
QT_LDFLAGS = @QT_LDFLAGS@
348
354
RANLIB = @RANLIB@
 
355
SED = @SED@
349
356
SET_MAKE = @SET_MAKE@
350
357
SHELL = @SHELL@
351
358
SSL_INCLUDES = @SSL_INCLUDES@
396
403
docdir = @docdir@
397
404
dvidir = @dvidir@
398
405
exec_prefix = @exec_prefix@
 
406
have_pkg_config = @have_pkg_config@
399
407
host = @host@
400
408
host_alias = @host_alias@
401
409
host_cpu = @host_cpu@
453
461
target_cpu = @target_cpu@
454
462
target_os = @target_os@
455
463
target_vendor = @target_vendor@
 
464
top_build_prefix = @top_build_prefix@
456
465
top_builddir = @top_builddir@
457
466
top_srcdir = @top_srcdir@
458
467
x_includes = @x_includes@
462
471
xdg_menudir = @xdg_menudir@
463
472
AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
464
473
INCLUDES = -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
465
 
SUBDIRS = kssl kio bookmarks kfile . kpasswdserver misc pics tests kioexec httpfilter
 
474
SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter
 
475
DIST_SUBDIRS = kpasswdserver misc
466
476
lib_LTLIBRARIES = libkio.la
467
477
libkio_la_SOURCES = dummy.cpp
468
478
libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
472
482
        kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
473
483
        ../kdeui/libkdeui.la ../kdesu/libkdesu.la \
474
484
        ../kwallet/client/libkwalletclient.la \
475
 
        $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS)
 
485
        $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
476
486
 
477
487
kde_mime_DATA = magic
478
488
kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
497
507
 
498
508
.SUFFIXES:
499
509
.SUFFIXES: .cpp .lo .o .obj
500
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 
510
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
501
511
#>-     @for dep in $?; do \
502
512
#>-       case '$(am__configure_deps)' in \
503
513
#>-         *$$dep*) \
535
545
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
536
546
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
537
547
 
538
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
548
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
539
549
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
540
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
550
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
541
551
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
542
552
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
543
553
        @$(NORMAL_INSTALL)
1132
1142
.NOEXPORT:
1133
1143
 
1134
1144
#>+ 2
1135
 
KDE_DIST=DESIGN Mainpage.dox kcmodule.desktop Makefile.in proxytype.pl DESIGN.metadata kpasswdserver.desktop kcomprfilter.desktop renamedlgplugin.desktop DESKTOP_ENTRY_STANDARD DESIGN.mimetypes DESIGN.krun kfileplugin.desktop kscan.desktop kurifilterplugin.desktop kdatatool.desktop magic data.protocol kioslave.upd application.desktop useragent.pl Makefile.am 
 
1145
KDE_DIST=DESIGN Mainpage.dox kcmodule.desktop Makefile.in proxytype.pl DESIGN.metadata kpasswdserver.desktop kcomprfilter.desktop renamedlgplugin.desktop DESKTOP_ENTRY_STANDARD DESIGN.krun DESIGN.mimetypes kfileplugin.desktop kscan.desktop kurifilterplugin.desktop kdatatool.desktop magic data.protocol kioslave.upd application.desktop useragent.pl Makefile.am 
1136
1146
 
1137
1147
#>+ 2
1138
1148
docs-am: