← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gtkhtml3.14/trusty-proposed

« back to all changes in this revision

Viewing changes to gtkhtml/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2010-11-02 14:34:48 UTC
  • mfrom: (1.6.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102143448-3cxzy1h4oh5v7igz
Tags: 1:3.32.0-0ubuntu1
https://launchpad.net/bugs/178959
https://launchpad.net/bugs/284060
https://launchpad.net/bugs/562633
* New upstream release 3.32.0
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
* debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
* debian/rules: append API_VER for libgtkhtml-editor chrpath as well
* debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
  file name.
* debian/*.shlibs: update shlibs files for new version with same soname, also
  rename libgtkhtml-editor to libgtkhtml-editor-3.14
* debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
* debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
* debian/rules: disable deprecation warnings so the build completes

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtkhtml/Makefile.am
30
30
        -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"         \
31
31
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
32
32
 
33
 
lib_LTLIBRARIES = libgtkhtml-3.14.la
34
 
 
35
33
libgtkhtmldir = $(includedir)/libgtkhtml-@GTKHTML_API_VERSION@/gtkhtml
36
34
 
37
35
# FIXME not all the stuff should be installed!
49
47
        htmltokenizer.h                         \
50
48
        $(NULL)
51
49
 
52
 
libgtkhtml_3_14_la_SOURCES =                    \
 
50
csources =                                      \
53
51
        gtkhtml-embedded.c                      \
54
52
        gtkhtml-properties.c                    \
55
53
        gtkhtml-search.c                        \
200
198
        htmliframe.h                            \
201
199
        htmlframe.h                             \
202
200
        htmlframeset.h                          \
 
201
        gtk-compat.h                            \
203
202
        $(PLATFORM_DEP_SOURCES)                 \
204
203
        $(NULL)
205
204
 
 
205
if ENABLE_GTK3
 
206
lib_LTLIBRARIES = libgtkhtml-4.0.la
 
207
libgtkhtml_4_0_la_SOURCES = $(csources)
 
208
libgtkhtml_4_0_la_LDFLAGS = -version-info $(GTKHTML_GTK3_CURRENT):$(GTKHTML_GTK3_REVISION):$(GTKHTML_GTK3_AGE) -no-undefined
 
209
libgtkhtml_4_0_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
 
210
else
 
211
lib_LTLIBRARIES = libgtkhtml-3.14.la
 
212
libgtkhtml_3_14_la_SOURCES = $(csources)
206
213
libgtkhtml_3_14_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
207
214
libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
 
215
endif
208
216
 
209
217
dist-hook:
210
218
        mkdir $(distdir)/tests