← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gimp/lucid-proposed

« back to all changes in this revision

Viewing changes to plug-ins/help/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2009-02-16 12:46:59 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20090216124659-f5t9cchwya1iob6h
Tags: 2.6.5-1ubuntu1
https://launchpad.net/bugs/330098
* Merge from Debian unstable (LP: #330098), Ubuntu remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + updated some strings for ubuntu
  - debian/rules:
    + updated translation templates
  - debian/control:
    + Drop webkit build dependency. gimp is the only thing pulling
      in webkit for the desktop CDs, and makes them explode
      Without the webkit help browser
      plugin, help will just be displayed in the default browser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/help/Makefile.in
69
69
am_help_OBJECTS = help.$(OBJEXT)
70
70
help_OBJECTS = $(am_help_OBJECTS)
71
71
help_LDADD = $(LDADD)
72
 
help_DEPENDENCIES = $(libgimphelp) $(libgimp) $(libgimpcolor) \
73
 
        $(libgimpbase) $(libgimpmath) $(am__DEPENDENCIES_1) \
74
 
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 
72
help_DEPENDENCIES = $(libgimphelp) $(libgimp) $(libgimpconfig) \
 
73
        $(libgimpcolor) $(libgimpbase) $(libgimpmath) \
 
74
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 
75
        $(am__DEPENDENCIES_1)
75
76
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
76
77
depcomp = $(SHELL) $(top_srcdir)/depcomp
77
78
am__depfiles_maybe = depfiles
406
407
top_srcdir = @top_srcdir@
407
408
libgimphelp = libgimphelp.a
408
409
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
 
410
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
409
411
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
410
412
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
411
413
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
434
436
        -I$(includedir)
435
437
 
436
438
LDADD = \
437
 
        $(libgimphelp)  \
438
 
        $(libgimp)      \
439
 
        $(libgimpcolor) \
440
 
        $(libgimpbase)  \
441
 
        $(libgimpmath)  \
442
 
        $(GIO_LIBS)     \
443
 
        $(RT_LIBS)      \
 
439
        $(libgimphelp)          \
 
440
        $(libgimp)              \
 
441
        $(libgimpconfig)        \
 
442
        $(libgimpcolor)         \
 
443
        $(libgimpbase)          \
 
444
        $(libgimpmath)          \
 
445
        $(GIO_LIBS)             \
 
446
        $(RT_LIBS)              \
444
447
        $(INTLLIBS)
445
448
 
446
449
gimp_help_lookup_SOURCES = gimp-help-lookup.c