← Back to branch summary

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

« back to all changes in this revision

Viewing changes to khtml/java/dummy/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/java/dummy/Makefile.in
109
109
AUTODIRS = @AUTODIRS@
110
110
AUTOHEADER = @AUTOHEADER@
111
111
AUTOMAKE = @AUTOMAKE@
 
112
AVAHI_CFLAGS = @AVAHI_CFLAGS@
 
113
AVAHI_LIBS = @AVAHI_LIBS@
112
114
AWK = @AWK@
113
115
CC = @CC@
114
116
CCDEPMODE = @CCDEPMODE@
130
132
DOXYGEN = @DOXYGEN@
131
133
DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
132
134
DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
 
135
DSYMUTIL = @DSYMUTIL@
133
136
ECHO = @ECHO@
134
137
ECHO_C = @ECHO_C@
135
138
ECHO_N = @ECHO_N@
223
226
LIBXSLT_RPATH = @LIBXSLT_RPATH@
224
227
LIBZ = @LIBZ@
225
228
LIB_CUPS = @LIB_CUPS@
226
 
LIB_DNSSD = @LIB_DNSSD@
227
229
LIB_EXR = @LIB_EXR@
228
230
LIB_IDN = @LIB_IDN@
229
231
LIB_JASPER = @LIB_JASPER@
251
253
LIB_POLL = @LIB_POLL@
252
254
LIB_QPE = @LIB_QPE@
253
255
LIB_QT = @LIB_QT@
 
256
LIB_QT_EXT = @LIB_QT_EXT@
254
257
LIB_SMB = @LIB_SMB@
255
258
LIB_X11 = @LIB_X11@
256
259
LIB_XEXT = @LIB_XEXT@
260
263
LUA = @LUA@
261
264
LUA_INCLUDES = @LUA_INCLUDES@
262
265
LUA_LIBS = @LUA_LIBS@
 
266
MAINT = @MAINT@
263
267
MAKEINFO = @MAKEINFO@
264
268
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
265
269
MCOPIDL = @MCOPIDL@
269
273
MKDIR_P = @MKDIR_P@
270
274
MOC = @MOC@
271
275
MSGFMT = @MSGFMT@
 
276
NMEDIT = @NMEDIT@
272
277
NOOPT_CFLAGS = @NOOPT_CFLAGS@
273
278
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
274
279
OBJEXT = @OBJEXT@
288
293
QT_INCLUDES = @QT_INCLUDES@
289
294
QT_LDFLAGS = @QT_LDFLAGS@
290
295
RANLIB = @RANLIB@
 
296
SED = @SED@
291
297
SET_MAKE = @SET_MAKE@
292
298
SHELL = @SHELL@
293
299
SSL_INCLUDES = @SSL_INCLUDES@
338
344
docdir = @docdir@
339
345
dvidir = @dvidir@
340
346
exec_prefix = @exec_prefix@
 
347
have_pkg_config = @have_pkg_config@
341
348
host = @host@
342
349
host_alias = @host_alias@
343
350
host_cpu = @host_cpu@
395
402
target_cpu = @target_cpu@
396
403
target_os = @target_os@
397
404
target_vendor = @target_vendor@
 
405
top_build_prefix = @top_build_prefix@
398
406
top_builddir = @top_builddir@
399
407
top_srcdir = @top_srcdir@
400
408
x_includes = @x_includes@
411
419
 
412
420
.SUFFIXES:
413
421
.SUFFIXES: .cpp .lo .o .obj
414
 
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 
422
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
415
423
#>-     @for dep in $?; do \
416
424
#>-       case '$(am__configure_deps)' in \
417
425
#>-         *$$dep*) \
449
457
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
450
458
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
451
459
 
452
 
$(top_srcdir)/configure:  $(am__configure_deps)
 
460
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
453
461
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
454
 
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
462
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
455
463
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
456
464
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
457
465
        @$(NORMAL_INSTALL)