← Back to branch summary

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

« back to all changes in this revision

Viewing changes to khtml/html/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:
khtml/html/Makefile.in
127
127
AUTODIRS = @AUTODIRS@
128
128
AUTOHEADER = @AUTOHEADER@
129
129
AUTOMAKE = @AUTOMAKE@
 
130
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
131
AVAHI_LIBS = @AVAHI_LIBS@
130
132
AWK = @AWK@
131
133
CC = @CC@
132
134
CCDEPMODE = @CCDEPMODE@
148
150
DOXYGEN = @DOXYGEN@
149
151
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
150
152
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
153
DSYMUTIL = @DSYMUTIL@
151
154
ECHO = @ECHO@
152
155
ECHO_C = @ECHO_C@
153
156
ECHO_N = @ECHO_N@
241
244
LIBXSLT_RPATH = @LIBXSLT_RPATH@
242
245
LIBZ = @LIBZ@
243
246
LIB_CUPS = @LIB_CUPS@
244
 
LIB_DNSSD = @LIB_DNSSD@
245
247
LIB_EXR = @LIB_EXR@
246
248
LIB_IDN = @LIB_IDN@
247
249
LIB_JASPER = @LIB_JASPER@
269
271
LIB_POLL = @LIB_POLL@
270
272
LIB_QPE = @LIB_QPE@
271
273
LIB_QT = @LIB_QT@
 
274
LIB_QT_EXT = @LIB_QT_EXT@
272
275
LIB_SMB = @LIB_SMB@
273
276
LIB_X11 = @LIB_X11@
274
277
LIB_XEXT = @LIB_XEXT@
278
281
LUA = @LUA@
279
282
LUA_INCLUDES = @LUA_INCLUDES@
280
283
LUA_LIBS = @LUA_LIBS@
 
284
MAINT = @MAINT@
281
285
MAKEINFO = @MAKEINFO@
282
286
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
283
287
MCOPIDL = @MCOPIDL@
287
291
MKDIR_P = @MKDIR_P@
288
292
MOC = @MOC@
289
293
MSGFMT = @MSGFMT@
 
294
NMEDIT = @NMEDIT@
290
295
NOOPT_CFLAGS = @NOOPT_CFLAGS@
291
296
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
292
297
OBJEXT = @OBJEXT@
306
311
QT_INCLUDES = @QT_INCLUDES@
307
312
QT_LDFLAGS = @QT_LDFLAGS@
308
313
RANLIB = @RANLIB@
 
314
SED = @SED@
309
315
SET_MAKE = @SET_MAKE@
310
316
SHELL = @SHELL@
311
317
SSL_INCLUDES = @SSL_INCLUDES@
356
362
docdir = @docdir@
357
363
dvidir = @dvidir@
358
364
exec_prefix = @exec_prefix@
 
365
have_pkg_config = @have_pkg_config@
359
366
host = @host@
360
367
host_alias = @host_alias@
361
368
host_cpu = @host_cpu@
413
420
target_cpu = @target_cpu@
414
421
target_os = @target_os@
415
422
target_vendor = @target_vendor@
 
423
top_build_prefix = @top_build_prefix@
416
424
top_builddir = @top_builddir@
417
425
top_srcdir = @top_srcdir@
418
426
x_includes = @x_includes@
451
459
 
452
460
.SUFFIXES:
453
461
.SUFFIXES: .cpp .lo .o .obj
454
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 
462
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
455
463
#>-     @for dep in $?; do \
456
464
#>-       case '$(am__configure_deps)' in \
457
465
#>-         *$$dep*) \
489
497
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
490
498
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
491
499
 
492
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
500
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
493
501
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
494
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
502
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
495
503
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
496
504
 
497
505
clean-noinstLTLIBRARIES:
746
754
.NOEXPORT:
747
755
 
748
756
#>+ 3
 
757
html_objectimpl.moc: $(srcdir)/html_objectimpl.h
 
758
        $(MOC) $(srcdir)/html_objectimpl.h -o html_objectimpl.moc
 
759
 
 
760
#>+ 2
 
761
mocs: html_objectimpl.moc
 
762
 
 
763
#>+ 3
749
764
html_documentimpl.moc: $(srcdir)/html_documentimpl.h
750
765
        $(MOC) $(srcdir)/html_documentimpl.h -o html_documentimpl.moc
751
766
 
753
768
mocs: html_documentimpl.moc
754
769
 
755
770
#>+ 3
756
 
html_objectimpl.moc: $(srcdir)/html_objectimpl.h
757
 
        $(MOC) $(srcdir)/html_objectimpl.h -o html_objectimpl.moc
758
 
 
759
 
#>+ 2
760
 
mocs: html_objectimpl.moc
761
 
 
762
 
#>+ 3
763
771
clean-metasources:
764
 
        -rm -f  html_documentimpl.moc html_objectimpl.moc
 
772
        -rm -f  html_objectimpl.moc html_documentimpl.moc
765
773
 
766
774
#>+ 2
767
775
KDE_DIST=dtd.dtd Makefile.in doctypes.cpp doctypes.gperf Makefile.am 
808
816
 
809
817
 
810
818
#>+ 11
811
 
libkhtmlhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlparser.cpp $(srcdir)/htmltokenizer.cpp $(srcdir)/dtd.cpp $(srcdir)/html_headimpl.cpp $(srcdir)/html_blockimpl.cpp $(srcdir)/html_elementimpl.cpp $(srcdir)/html_inlineimpl.cpp $(srcdir)/html_documentimpl.cpp $(srcdir)/html_baseimpl.cpp $(srcdir)/html_imageimpl.cpp $(srcdir)/html_listimpl.cpp $(srcdir)/html_miscimpl.cpp $(srcdir)/html_formimpl.cpp $(srcdir)/html_objectimpl.cpp $(srcdir)/html_tableimpl.cpp  html_objectimpl.moc html_documentimpl.moc
 
819
libkhtmlhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlparser.cpp $(srcdir)/htmltokenizer.cpp $(srcdir)/dtd.cpp $(srcdir)/html_headimpl.cpp $(srcdir)/html_blockimpl.cpp $(srcdir)/html_elementimpl.cpp $(srcdir)/html_inlineimpl.cpp $(srcdir)/html_documentimpl.cpp $(srcdir)/html_baseimpl.cpp $(srcdir)/html_imageimpl.cpp $(srcdir)/html_listimpl.cpp $(srcdir)/html_miscimpl.cpp $(srcdir)/html_formimpl.cpp $(srcdir)/html_objectimpl.cpp $(srcdir)/html_tableimpl.cpp  html_documentimpl.moc html_objectimpl.moc
812
820
        @echo 'creating libkhtmlhtml_la.all_cpp.cpp ...'; \
813
821
        rm -f libkhtmlhtml_la.all_cpp.files libkhtmlhtml_la.all_cpp.final; \
814
822
        echo "#define KDE_USE_FINAL 1" >> libkhtmlhtml_la.all_cpp.final; \