← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kabc/plugins/dir/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:
kabc/plugins/dir/Makefile.in
62
62
kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
63
63
libLTLIBRARIES_INSTALL = $(INSTALL)
64
64
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
65
 
kabc_dir_la_DEPENDENCIES = libkabc_dir.la
 
65
am__DEPENDENCIES_1 =
 
66
kabc_dir_la_DEPENDENCIES = libkabc_dir.la $(am__DEPENDENCIES_1) \
 
67
        $(am__DEPENDENCIES_1)
66
68
am_kabc_dir_la_OBJECTS = resourcedirplugin.lo
67
69
#>- kabc_dir_la_OBJECTS = $(am_kabc_dir_la_OBJECTS)
68
70
#>+ 1
74
76
kabc_dir_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
75
77
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
76
78
        $(CXXFLAGS) $(KDE_CXXFLAGS) $(kabc_dir_la_LDFLAGS) $(LDFLAGS) -o $@
77
 
am__DEPENDENCIES_1 =
78
 
libkabc_dir_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 
79
libkabc_dir_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 
80
        $(am__DEPENDENCIES_1) \
 
81
        $(top_builddir)/kresources/libkresources.la \
 
82
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 
83
        $(am__DEPENDENCIES_1)
79
84
am_libkabc_dir_la_OBJECTS = resourcedir.lo resourcedirconfig.lo
80
85
#>- libkabc_dir_la_OBJECTS = $(am_libkabc_dir_la_OBJECTS)
81
86
#>+ 4
134
139
AUTODIRS = @AUTODIRS@
135
140
AUTOHEADER = @AUTOHEADER@
136
141
AUTOMAKE = @AUTOMAKE@
 
142
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
143
AVAHI_LIBS = @AVAHI_LIBS@
137
144
AWK = @AWK@
138
145
CC = @CC@
139
146
CCDEPMODE = @CCDEPMODE@
155
162
DOXYGEN = @DOXYGEN@
156
163
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
157
164
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
165
DSYMUTIL = @DSYMUTIL@
158
166
ECHO = @ECHO@
159
167
ECHO_C = @ECHO_C@
160
168
ECHO_N = @ECHO_N@
248
256
LIBXSLT_RPATH = @LIBXSLT_RPATH@
249
257
LIBZ = @LIBZ@
250
258
LIB_CUPS = @LIB_CUPS@
251
 
LIB_DNSSD = @LIB_DNSSD@
252
259
LIB_EXR = @LIB_EXR@
253
260
LIB_IDN = @LIB_IDN@
254
261
LIB_JASPER = @LIB_JASPER@
276
283
LIB_POLL = @LIB_POLL@
277
284
LIB_QPE = @LIB_QPE@
278
285
LIB_QT = @LIB_QT@
 
286
LIB_QT_EXT = @LIB_QT_EXT@
279
287
LIB_SMB = @LIB_SMB@
280
288
LIB_X11 = @LIB_X11@
281
289
LIB_XEXT = @LIB_XEXT@
285
293
LUA = @LUA@
286
294
LUA_INCLUDES = @LUA_INCLUDES@
287
295
LUA_LIBS = @LUA_LIBS@
 
296
MAINT = @MAINT@
288
297
MAKEINFO = @MAKEINFO@
289
298
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
290
299
MCOPIDL = @MCOPIDL@
294
303
MKDIR_P = @MKDIR_P@
295
304
MOC = @MOC@
296
305
MSGFMT = @MSGFMT@
 
306
NMEDIT = @NMEDIT@
297
307
NOOPT_CFLAGS = @NOOPT_CFLAGS@
298
308
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
299
309
OBJEXT = @OBJEXT@
313
323
QT_INCLUDES = @QT_INCLUDES@
314
324
QT_LDFLAGS = @QT_LDFLAGS@
315
325
RANLIB = @RANLIB@
 
326
SED = @SED@
316
327
SET_MAKE = @SET_MAKE@
317
328
SHELL = @SHELL@
318
329
SSL_INCLUDES = @SSL_INCLUDES@
363
374
docdir = @docdir@
364
375
dvidir = @dvidir@
365
376
exec_prefix = @exec_prefix@
 
377
have_pkg_config = @have_pkg_config@
366
378
host = @host@
367
379
host_alias = @host_alias@
368
380
host_cpu = @host_cpu@
420
432
target_cpu = @target_cpu@
421
433
target_os = @target_os@
422
434
target_vendor = @target_vendor@
 
435
top_build_prefix = @top_build_prefix@
423
436
top_builddir = @top_builddir@
424
437
top_srcdir = @top_srcdir@
425
438
x_includes = @x_includes@
434
447
lib_LTLIBRARIES = libkabc_dir.la
435
448
libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
436
449
libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
437
 
libkabc_dir_la_LIBADD = $(LIB_KABC)
 
450
libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
438
451
libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
439
452
kde_module_LTLIBRARIES = kabc_dir.la
440
453
kabc_dir_la_SOURCES = resourcedirplugin.cpp
441
454
kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
442
 
kabc_dir_la_LIBADD = libkabc_dir.la
 
455
kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE)
443
456
#>- METASOURCES = AUTO
444
457
kabcincludedir = $(includedir)/kabc
445
458
kabcinclude_HEADERS = resourcedir.h
451
464
 
452
465
.SUFFIXES:
453
466
.SUFFIXES: .cpp .lo .o .obj
454
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 
467
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
455
468
#>-     @for dep in $?; do \
456
469
#>-       case '$(am__configure_deps)' in \
457
470
#>-         *$$dep*) \
489
502
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
490
503
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
491
504
 
492
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
505
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
493
506
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
494
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
507
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
495
508
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
496
509
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
497
510
        @$(NORMAL_INSTALL)