diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-21 02:16:58 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-21 02:57:14 +0800 |
| commit | 8e9aa89166cf774b6d7efe83db68ac2d6540e840 (patch) | |
| tree | 517ddbabbb7bbbab16648fb9ecf2efea82caeb74 /libempathy-gtk | |
| parent | e99bb6f9e596bbc33cefdcae5da76802424504ab (diff) | |
| download | gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar.gz gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar.bz2 gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar.lz gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar.xz gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.tar.zst gsoc2013-empathy-8e9aa89166cf774b6d7efe83db68ac2d6540e840.zip | |
Stop building libempathy{,-gtk} as a shared library. Closes bug #599086
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/Makefile.am | 49 | ||||
| -rw-r--r-- | libempathy-gtk/libempathy-gtk.pc.in | 13 |
2 files changed, 19 insertions, 43 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 25e3dc9d9..cdcd0bd3f 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = \ empathy-gtk-enum-types.h \ empathy-gtk-enum-types.c -lib_LTLIBRARIES = libempathy-gtk.la +noinst_LTLIBRARIES = libempathy-gtk.la libempathy_gtk_handwritten_source = \ empathy-account-chooser.c \ @@ -66,27 +66,6 @@ libempathy_gtk_handwritten_source = \ empathy-kludge-label.c \ empathy-ui-utils.c -libempathy_gtk_la_SOURCES = \ - $(libempathy_gtk_handwritten_source) \ - totem-subtitle-encoding.c totem-subtitle-encoding.h - -# do not distribute generated files -nodist_libempathy_gtk_la_SOURCES =\ - $(BUILT_SOURCES) - -libempathy_gtk_la_LIBADD = \ - $(LIBEMPATHYGTK_LIBS) \ - $(ENCHANT_LIBS) \ - $(LIBCHAMPLAIN_LIBS) \ - $(GEOCLUE_LIBS) \ - $(MOBLIN_LIBS) \ - $(WEBKIT_LIBS) \ - $(top_builddir)/libempathy/libempathy.la - -libempathy_gtk_la_LDFLAGS = \ - -version-info ${LIBEMPATHY_GTK_CURRENT}:${LIBEMPATHY_GTK_REVISION}:${LIBEMPATHY_GTK_AGE} \ - -export-symbols-regex ^empathy_ - libempathy_gtk_headers = \ empathy-account-chooser.h \ empathy-account-widget.h \ @@ -129,17 +108,30 @@ libempathy_gtk_headers = \ empathy-kludge-label.h \ empathy-ui-utils.h +libempathy_gtk_la_SOURCES = \ + $(libempathy_gtk_handwritten_source) \ + $(libempathy_gtk_headers) \ + totem-subtitle-encoding.c totem-subtitle-encoding.h + +# do not distribute generated files +nodist_libempathy_gtk_la_SOURCES =\ + $(BUILT_SOURCES) + +libempathy_gtk_la_LIBADD = \ + $(LIBEMPATHYGTK_LIBS) \ + $(ENCHANT_LIBS) \ + $(LIBCHAMPLAIN_LIBS) \ + $(GEOCLUE_LIBS) \ + $(MOBLIN_LIBS) \ + $(WEBKIT_LIBS) \ + $(top_builddir)/libempathy/libempathy.la + check_c_sources = \ $(libempathy_gtk_handwritten_source) \ $(libempathy_gtk_headers) include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -libempathy_gtk_includedir = $(includedir)/libempathy-gtk/ -libempathy_gtk_include_HEADERS = \ - $(libempathy_gtk_headers) \ - empathy-gtk-enum-types.h - uidir = $(datadir)/empathy ui_DATA = \ empathy-contact-widget.ui \ @@ -215,9 +207,6 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers) && cp xgen-gtc $(@F) \ && rm -f xgen-gtc -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libempathy-gtk.pc - EXTRA_DIST = \ $(ui_DATA) diff --git a/libempathy-gtk/libempathy-gtk.pc.in b/libempathy-gtk/libempathy-gtk.pc.in deleted file mode 100644 index e0e3f8088..000000000 --- a/libempathy-gtk/libempathy-gtk.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libempathy-gtk -Description: Empathy interface library -Requires: pkg-config >= 0.21 -Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, \ - libempathy, telepathy-glib, libcanberra-gtk -Version: @VERSION@ -Libs: -L${libdir} -lempathy-gtk -Cflags: -I${includedir} |