← Back to branch summary

~ubuntu-branches/ubuntu/raring/gtkhtml3.14/raring

« back to all changes in this revision

Viewing changes to components/editor/Makefile.in

  • 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:
components/editor/Makefile.in
42
42
bin_PROGRAMS = gtkhtml-editor-test$(EXEEXT)
43
43
subdir = components/editor
44
44
DIST_COMMON = $(libgtkhtml_editor_HEADERS) $(srcdir)/Makefile.am \
45
 
        $(srcdir)/Makefile.in $(srcdir)/gtkhtml-editor.pc.in ChangeLog
 
45
        $(srcdir)/Makefile.in $(srcdir)/gtkhtml-editor.pc.in
46
46
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
47
47
am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
48
48
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
103
103
        $(libglade_gtkhtml_editor_la_LDFLAGS) $(LDFLAGS) -o $@
104
104
@GLADE_CATALOG_TRUE@am_libglade_gtkhtml_editor_la_rpath = -rpath \
105
105
@GLADE_CATALOG_TRUE@    $(libglade_gtkhtml_editordir)
106
 
libgtkhtml_editor_la_DEPENDENCIES =  \
107
 
        $(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
 
106
@ENABLE_GTK3_FALSE@libgtkhtml_editor_3_14_la_DEPENDENCIES = $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
 
107
am__libgtkhtml_editor_3_14_la_SOURCES_DIST = gtkhtml-editor-marshal.c \
 
108
        gtkhtml-editor-marshal.h gtkhtml-spell-marshal.c \
 
109
        gtkhtml-spell-marshal.h gtkhtml-color-combo.c \
 
110
        gtkhtml-color-combo.h gtkhtml-color-palette.c \
 
111
        gtkhtml-color-palette.h gtkhtml-color-state.c \
 
112
        gtkhtml-color-state.h gtkhtml-color-swatch.c \
 
113
        gtkhtml-color-swatch.h gtkhtml-combo-box.c gtkhtml-combo-box.h \
 
114
        gtkhtml-editor.c gtkhtml-editor-actions.c \
 
115
        gtkhtml-editor-private.c gtkhtml-editor-private.h \
 
116
        gtkhtml-editor-signals.c gtkhtml-face.c gtkhtml-face.h \
 
117
        gtkhtml-face-action.c gtkhtml-face-action.h \
 
118
        gtkhtml-face-chooser.c gtkhtml-face-chooser.h \
 
119
        gtkhtml-face-chooser-menu.c gtkhtml-face-chooser-menu.h \
 
120
        gtkhtml-face-tool-button.c gtkhtml-face-tool-button.h \
 
121
        gtkhtml-spell-dialog.c gtkhtml-spell-dialog.h \
 
122
        gtkhtml-spell-checker.c gtkhtml-spell-language.c
108
123
am__objects_1 = gtkhtml-editor-marshal.lo gtkhtml-spell-marshal.lo
109
 
am_libgtkhtml_editor_la_OBJECTS = $(am__objects_1) \
110
 
        gtkhtml-color-combo.lo gtkhtml-color-palette.lo \
111
 
        gtkhtml-color-state.lo gtkhtml-color-swatch.lo \
112
 
        gtkhtml-combo-box.lo gtkhtml-editor.lo \
 
124
am__objects_2 = $(am__objects_1) gtkhtml-color-combo.lo \
 
125
        gtkhtml-color-palette.lo gtkhtml-color-state.lo \
 
126
        gtkhtml-color-swatch.lo gtkhtml-combo-box.lo gtkhtml-editor.lo \
113
127
        gtkhtml-editor-actions.lo gtkhtml-editor-private.lo \
114
128
        gtkhtml-editor-signals.lo gtkhtml-face.lo \
115
129
        gtkhtml-face-action.lo gtkhtml-face-chooser.lo \
116
130
        gtkhtml-face-chooser-menu.lo gtkhtml-face-tool-button.lo \
117
131
        gtkhtml-spell-dialog.lo gtkhtml-spell-checker.lo \
118
132
        gtkhtml-spell-language.lo
119
 
libgtkhtml_editor_la_OBJECTS = $(am_libgtkhtml_editor_la_OBJECTS)
120
 
libgtkhtml_editor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
121
 
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
122
 
        $(AM_CFLAGS) $(CFLAGS) $(libgtkhtml_editor_la_LDFLAGS) \
123
 
        $(LDFLAGS) -o $@
 
133
@ENABLE_GTK3_FALSE@am_libgtkhtml_editor_3_14_la_OBJECTS =  \
 
134
@ENABLE_GTK3_FALSE@     $(am__objects_2)
 
135
libgtkhtml_editor_3_14_la_OBJECTS =  \
 
136
        $(am_libgtkhtml_editor_3_14_la_OBJECTS)
 
137
libgtkhtml_editor_3_14_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 
138
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 
139
        $(AM_CFLAGS) $(CFLAGS) $(libgtkhtml_editor_3_14_la_LDFLAGS) \
 
140
        $(LDFLAGS) -o $@
 
141
@ENABLE_GTK3_FALSE@am_libgtkhtml_editor_3_14_la_rpath = -rpath \
 
142
@ENABLE_GTK3_FALSE@     $(libdir)
 
143
@ENABLE_GTK3_TRUE@libgtkhtml_editor_4_0_la_DEPENDENCIES = $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
 
144
am__libgtkhtml_editor_4_0_la_SOURCES_DIST = gtkhtml-editor-marshal.c \
 
145
        gtkhtml-editor-marshal.h gtkhtml-spell-marshal.c \
 
146
        gtkhtml-spell-marshal.h gtkhtml-color-combo.c \
 
147
        gtkhtml-color-combo.h gtkhtml-color-palette.c \
 
148
        gtkhtml-color-palette.h gtkhtml-color-state.c \
 
149
        gtkhtml-color-state.h gtkhtml-color-swatch.c \
 
150
        gtkhtml-color-swatch.h gtkhtml-combo-box.c gtkhtml-combo-box.h \
 
151
        gtkhtml-editor.c gtkhtml-editor-actions.c \
 
152
        gtkhtml-editor-private.c gtkhtml-editor-private.h \
 
153
        gtkhtml-editor-signals.c gtkhtml-face.c gtkhtml-face.h \
 
154
        gtkhtml-face-action.c gtkhtml-face-action.h \
 
155
        gtkhtml-face-chooser.c gtkhtml-face-chooser.h \
 
156
        gtkhtml-face-chooser-menu.c gtkhtml-face-chooser-menu.h \
 
157
        gtkhtml-face-tool-button.c gtkhtml-face-tool-button.h \
 
158
        gtkhtml-spell-dialog.c gtkhtml-spell-dialog.h \
 
159
        gtkhtml-spell-checker.c gtkhtml-spell-language.c
 
160
@ENABLE_GTK3_TRUE@am_libgtkhtml_editor_4_0_la_OBJECTS =  \
 
161
@ENABLE_GTK3_TRUE@      $(am__objects_2)
 
162
libgtkhtml_editor_4_0_la_OBJECTS =  \
 
163
        $(am_libgtkhtml_editor_4_0_la_OBJECTS)
 
164
libgtkhtml_editor_4_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 
165
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 
166
        $(AM_CFLAGS) $(CFLAGS) $(libgtkhtml_editor_4_0_la_LDFLAGS) \
 
167
        $(LDFLAGS) -o $@
 
168
@ENABLE_GTK3_TRUE@am_libgtkhtml_editor_4_0_la_rpath = -rpath $(libdir)
124
169
PROGRAMS = $(bin_PROGRAMS)
125
170
am_gtkhtml_editor_test_OBJECTS = main.$(OBJEXT)
126
171
gtkhtml_editor_test_OBJECTS = $(am_gtkhtml_editor_test_OBJECTS)
127
 
am__DEPENDENCIES_1 =
128
 
gtkhtml_editor_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
129
 
        libgtkhtml-editor.la \
130
 
        $(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
 
172
gtkhtml_editor_test_DEPENDENCIES =  \
 
173
        libgtkhtml-editor-@EDITOR_API_VERSION@.la \
 
174
        $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
131
175
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
132
176
depcomp = $(SHELL) $(top_srcdir)/depcomp
133
177
am__depfiles_maybe = depfiles
155
199
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
156
200
am__v_GEN_0 = @echo "  GEN   " $@;
157
201
SOURCES = $(libglade_gtkhtml_editor_la_SOURCES) \
158
 
        $(libgtkhtml_editor_la_SOURCES) $(gtkhtml_editor_test_SOURCES)
 
202
        $(libgtkhtml_editor_3_14_la_SOURCES) \
 
203
        $(libgtkhtml_editor_4_0_la_SOURCES) \
 
204
        $(gtkhtml_editor_test_SOURCES)
159
205
DIST_SOURCES = $(am__libglade_gtkhtml_editor_la_SOURCES_DIST) \
160
 
        $(libgtkhtml_editor_la_SOURCES) $(gtkhtml_editor_test_SOURCES)
 
206
        $(am__libgtkhtml_editor_3_14_la_SOURCES_DIST) \
 
207
        $(am__libgtkhtml_editor_4_0_la_SOURCES_DIST) \
 
208
        $(gtkhtml_editor_test_SOURCES)
161
209
DATA = $(gladecatalog_DATA) $(pkgconfig_DATA) $(ui_DATA)
162
210
HEADERS = $(libgtkhtml_editor_HEADERS)
163
211
ETAGS = etags
212
260
GMSGFMT = @GMSGFMT@
213
261
GNOME_GTKHTML_EDITOR_TYPE = @GNOME_GTKHTML_EDITOR_TYPE@
214
262
GREP = @GREP@
215
 
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
216
 
GTHREAD_LIBS = @GTHREAD_LIBS@
217
263
GTKHTML_AGE = @GTKHTML_AGE@
218
264
GTKHTML_API_VERSION = @GTKHTML_API_VERSION@
219
265
GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
220
266
GTKHTML_CURRENT = @GTKHTML_CURRENT@
 
267
GTKHTML_GTK3_AGE = @GTKHTML_GTK3_AGE@
 
268
GTKHTML_GTK3_CURRENT = @GTKHTML_GTK3_CURRENT@
 
269
GTKHTML_GTK3_REVISION = @GTKHTML_GTK3_REVISION@
221
270
GTKHTML_LIBS = @GTKHTML_LIBS@
222
271
GTKHTML_MODULES = @GTKHTML_MODULES@
223
272
GTKHTML_RELEASE_STRING = @GTKHTML_RELEASE_STRING@
336
385
top_build_prefix = @top_build_prefix@
337
386
top_builddir = @top_builddir@
338
387
top_srcdir = @top_srcdir@
339
 
gtkhtml_data = $(datadir)/gtkhtml-@GTKHTML_API_VERSION@
340
 
lib_LTLIBRARIES = libgtkhtml-editor.la
 
388
gtkhtml_data = $(datadir)/gtkhtml-@EDITOR_API_VERSION@
341
389
AM_CFLAGS = \
342
390
        @GTKHTML_CFLAGS@                        \
343
391
        -I$(top_srcdir)                         \
355
403
        gtkhtml-spell-marshal.c                 \
356
404
        gtkhtml-spell-marshal.h
357
405
 
358
 
libgtkhtml_editordir = $(includedir)/libgtkhtml-@GTKHTML_API_VERSION@/editor
359
 
libgtkhtml_editor_la_SOURCES = \
 
406
libgtkhtml_editordir = $(includedir)/libgtkhtml-@EDITOR_API_VERSION@/editor
 
407
csources = \
360
408
        $(BUILT_SOURCES)                        \
361
409
        gtkhtml-color-combo.c                   \
362
410
        gtkhtml-color-combo.h                   \
396
444
        gtkhtml-spell-checker.h                 \
397
445
        gtkhtml-spell-language.h
398
446
 
399
 
libgtkhtml_editor_la_LIBADD = \
400
 
        @GTKHTML_LIBS@                          \
401
 
        $(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
402
 
 
403
 
libgtkhtml_editor_la_LDFLAGS = -no-undefined
 
447
@ENABLE_GTK3_FALSE@lib_LTLIBRARIES = libgtkhtml-editor-3.14.la
 
448
@ENABLE_GTK3_TRUE@lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
 
449
@ENABLE_GTK3_TRUE@libgtkhtml_editor_4_0_la_SOURCES = $(csources) 
 
450
@ENABLE_GTK3_TRUE@libgtkhtml_editor_4_0_la_LIBADD = \
 
451
@ENABLE_GTK3_TRUE@      @GTKHTML_LIBS@                          \
 
452
@ENABLE_GTK3_TRUE@      $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
 
453
 
 
454
@ENABLE_GTK3_TRUE@libgtkhtml_editor_4_0_la_LDFLAGS = -no-undefined
 
455
@ENABLE_GTK3_FALSE@libgtkhtml_editor_3_14_la_SOURCES = $(csources) 
 
456
@ENABLE_GTK3_FALSE@libgtkhtml_editor_3_14_la_LIBADD = \
 
457
@ENABLE_GTK3_FALSE@     @GTKHTML_LIBS@                          \
 
458
@ENABLE_GTK3_FALSE@     $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
 
459
 
 
460
@ENABLE_GTK3_FALSE@libgtkhtml_editor_3_14_la_LDFLAGS = -no-undefined
404
461
gtkhtml_editor_test_SOURCES = main.c
405
462
gtkhtml_editor_test_LDADD = \
406
463
        $(GTHREAD_LIBS)                         \
407
 
        libgtkhtml-editor.la                    \
408
 
        $(top_builddir)/gtkhtml/libgtkhtml-@GTKHTML_API_VERSION@.la
 
464
        libgtkhtml-editor-@EDITOR_API_VERSION@.la                       \
 
465
        $(top_builddir)/gtkhtml/libgtkhtml-@EDITOR_API_VERSION@.la
409
466
 
410
467
pkgconfigdir = $(libdir)/pkgconfig
411
 
pkgconfig_DATA = gtkhtml-editor.pc
 
468
pkgconfig_in_files = gtkhtml-editor.pc.in
 
469
pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(EDITOR_API_VERSION).pc)
412
470
uidir = $(gtkhtml_data)
413
471
ui_DATA = \
414
472
        gtkhtml-editor-builder.ui               \
415
473
        gtkhtml-editor-manager.ui
416
474
 
417
475
EXTRA_DIST = \
418
 
        ChangeLog                               \
419
476
        $(pkgconfig_DATA)                       \
420
477
        $(ui_DATA)                              \
421
478
        gtkhtml-editor-marshal.list             \
422
479
        gtkhtml-spell-marshal.list
423
480
 
424
 
CLEANFILES = \
425
 
        $(BUILT_SOURCES)
426
 
 
 
481
CLEANFILES = $(BUILT_SOURCES)
 
482
DISTCLEANFILES = $(pkgconfig_DATA)
427
483
@GLADE_CATALOG_TRUE@gladecatalog_DATA = gtkhtml-editor.xml
428
484
@GLADE_CATALOG_TRUE@gladecatalogdir = `$(PKG_CONFIG) --variable=catalogdir gladeui-1.0`
429
485
@GLADE_CATALOG_TRUE@libglade_gtkhtml_editor_LTLIBRARIES = libglade-gtkhtml-editor.la
539
595
        done
540
596
libglade-gtkhtml-editor.la: $(libglade_gtkhtml_editor_la_OBJECTS) $(libglade_gtkhtml_editor_la_DEPENDENCIES) 
541
597
        $(AM_V_CCLD)$(libglade_gtkhtml_editor_la_LINK) $(am_libglade_gtkhtml_editor_la_rpath) $(libglade_gtkhtml_editor_la_OBJECTS) $(libglade_gtkhtml_editor_la_LIBADD) $(LIBS)
542
 
libgtkhtml-editor.la: $(libgtkhtml_editor_la_OBJECTS) $(libgtkhtml_editor_la_DEPENDENCIES) 
543
 
        $(AM_V_CCLD)$(libgtkhtml_editor_la_LINK) -rpath $(libdir) $(libgtkhtml_editor_la_OBJECTS) $(libgtkhtml_editor_la_LIBADD) $(LIBS)
 
598
libgtkhtml-editor-3.14.la: $(libgtkhtml_editor_3_14_la_OBJECTS) $(libgtkhtml_editor_3_14_la_DEPENDENCIES) 
 
599
        $(AM_V_CCLD)$(libgtkhtml_editor_3_14_la_LINK) $(am_libgtkhtml_editor_3_14_la_rpath) $(libgtkhtml_editor_3_14_la_OBJECTS) $(libgtkhtml_editor_3_14_la_LIBADD) $(LIBS)
 
600
libgtkhtml-editor-4.0.la: $(libgtkhtml_editor_4_0_la_OBJECTS) $(libgtkhtml_editor_4_0_la_DEPENDENCIES) 
 
601
        $(AM_V_CCLD)$(libgtkhtml_editor_4_0_la_LINK) $(am_libgtkhtml_editor_4_0_la_rpath) $(libgtkhtml_editor_4_0_la_OBJECTS) $(libgtkhtml_editor_4_0_la_LIBADD) $(LIBS)
544
602
install-binPROGRAMS: $(bin_PROGRAMS)
545
603
        @$(NORMAL_INSTALL)
546
604
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
885
943
distclean-generic:
886
944
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
887
945
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
946
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
888
947
 
889
948
maintainer-clean-generic:
890
949
        @echo "This command is intended for maintainers to use"
1009
1068
        echo "#include \"gtkhtml-spell-marshal.h\"" > $@ && \
1010
1069
        $(GLIB_GENMARSHAL) $< --body --prefix=gtkhtml_spell_marshal >> $@
1011
1070
 
 
1071
%-$(EDITOR_API_VERSION).pc: %.pc
 
1072
        cp $< $@
 
1073
 
1012
1074
-include $(top_srcdir)/git.mk
1013
1075
 
1014
1076
# Tell versions [3.59,3.63) of GNU make to not export all variables.