← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kunittest/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:
kunittest/Makefile.in
79
79
        $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
80
80
        $(kunittest_samplemodule_la_LDFLAGS) $(LDFLAGS) -o $@
81
81
am__DEPENDENCIES_1 =
82
 
libkunittest_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 
82
libkunittest_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 
83
        $(am__DEPENDENCIES_1)
83
84
am_libkunittest_la_OBJECTS = runner.lo tester.lo
84
85
#>- libkunittest_la_OBJECTS = $(am_libkunittest_la_OBJECTS)
85
86
#>+ 4
153
154
AUTODIRS = @AUTODIRS@
154
155
AUTOHEADER = @AUTOHEADER@
155
156
AUTOMAKE = @AUTOMAKE@
 
157
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
158
AVAHI_LIBS = @AVAHI_LIBS@
156
159
AWK = @AWK@
157
160
CC = @CC@
158
161
CCDEPMODE = @CCDEPMODE@
174
177
DOXYGEN = @DOXYGEN@
175
178
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
176
179
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
180
DSYMUTIL = @DSYMUTIL@
177
181
ECHO = @ECHO@
178
182
ECHO_C = @ECHO_C@
179
183
ECHO_N = @ECHO_N@
267
271
LIBXSLT_RPATH = @LIBXSLT_RPATH@
268
272
LIBZ = @LIBZ@
269
273
LIB_CUPS = @LIB_CUPS@
270
 
LIB_DNSSD = @LIB_DNSSD@
271
274
LIB_EXR = @LIB_EXR@
272
275
LIB_IDN = @LIB_IDN@
273
276
LIB_JASPER = @LIB_JASPER@
295
298
LIB_POLL = @LIB_POLL@
296
299
LIB_QPE = @LIB_QPE@
297
300
LIB_QT = @LIB_QT@
 
301
LIB_QT_EXT = @LIB_QT_EXT@
298
302
LIB_SMB = @LIB_SMB@
299
303
LIB_X11 = @LIB_X11@
300
304
LIB_XEXT = @LIB_XEXT@
304
308
LUA = @LUA@
305
309
LUA_INCLUDES = @LUA_INCLUDES@
306
310
LUA_LIBS = @LUA_LIBS@
 
311
MAINT = @MAINT@
307
312
MAKEINFO = @MAKEINFO@
308
313
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
309
314
MCOPIDL = @MCOPIDL@
313
318
MKDIR_P = @MKDIR_P@
314
319
MOC = @MOC@
315
320
MSGFMT = @MSGFMT@
 
321
NMEDIT = @NMEDIT@
316
322
NOOPT_CFLAGS = @NOOPT_CFLAGS@
317
323
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
318
324
OBJEXT = @OBJEXT@
332
338
QT_INCLUDES = @QT_INCLUDES@
333
339
QT_LDFLAGS = @QT_LDFLAGS@
334
340
RANLIB = @RANLIB@
 
341
SED = @SED@
335
342
SET_MAKE = @SET_MAKE@
336
343
SHELL = @SHELL@
337
344
SSL_INCLUDES = @SSL_INCLUDES@
382
389
docdir = @docdir@
383
390
dvidir = @dvidir@
384
391
exec_prefix = @exec_prefix@
 
392
have_pkg_config = @have_pkg_config@
385
393
host = @host@
386
394
host_alias = @host_alias@
387
395
host_cpu = @host_cpu@
439
447
target_cpu = @target_cpu@
440
448
target_os = @target_os@
441
449
target_vendor = @target_vendor@
 
450
top_build_prefix = @top_build_prefix@
442
451
top_builddir = @top_builddir@
443
452
top_srcdir = @top_srcdir@
444
453
x_includes = @x_includes@
451
460
lib_LTLIBRARIES = libkunittest.la
452
461
libkunittest_la_SOURCES = runner.cpp tester.cpp
453
462
libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
454
 
libkunittest_la_LIBADD = $(LIB_KDECORE)
 
463
libkunittest_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
455
464
libkunittestinclude_HEADERS = runner.h tester.h module.h
456
465
libkunittestincludedir = $(includedir)/kunittest
457
466
kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH)
470
479
 
471
480
.SUFFIXES:
472
481
.SUFFIXES: .cpp .lo .o .obj
473
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
 
482
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
474
483
#>-     @for dep in $?; do \
475
484
#>-       case '$(am__configure_deps)' in \
476
485
#>-         *$$dep*) \
508
517
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
509
518
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
510
519
 
511
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
520
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
512
521
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
513
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
522
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
514
523
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
515
524
 
516
525
clean-checkLTLIBRARIES: