diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 49 | ||||
| -rw-r--r-- | libempathy-gtk/libempathy-gtk.pc.in | 13 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 103 | ||||
| -rw-r--r-- | libempathy/libempathy.pc.in | 13 |
6 files changed, 65 insertions, 135 deletions
@@ -7,7 +7,6 @@ Makefile .libs *.sw[po] *enum-types* -*.pc *.tar.* *.orig *.rej diff --git a/configure.ac b/configure.ac index 18536b1c..36cf1fd5 100644 --- a/configure.ac +++ b/configure.ac @@ -5,25 +5,6 @@ AC_COPYRIGHT([ Copyright (C) 2007-2008 Collabora Ltd. ]) -# LT Version numbers, remember to change them just *before* a release. -# (Interfaces removed: CURRENT++, AGE=0, REVISION=0) -# (Interfaces added: CURRENT++, AGE++, REVISION=0) -# (No interfaces changed: REVISION++) -LIBEMPATHY_CURRENT=30 -LIBEMPATHY_AGE=0 -LIBEMPATHY_REVISION=0 - -LIBEMPATHY_GTK_CURRENT=28 -LIBEMPATHY_GTK_AGE=0 -LIBEMPATHY_GTK_REVISION=0 - -AC_SUBST(LIBEMPATHY_CURRENT) -AC_SUBST(LIBEMPATHY_AGE) -AC_SUBST(LIBEMPATHY_REVISION) -AC_SUBST(LIBEMPATHY_GTK_CURRENT) -AC_SUBST(LIBEMPATHY_GTK_AGE) -AC_SUBST(LIBEMPATHY_GTK_REVISION) - # Minimal version required GLIB_REQUIRED=2.22.0 GTK_REQUIRED=2.16.0 @@ -421,9 +402,7 @@ AC_OUTPUT([ extensions/Makefile po/Makefile.in libempathy/Makefile - libempathy/libempathy.pc libempathy-gtk/Makefile - libempathy-gtk/libempathy-gtk.pc src/Makefile nautilus-sendto-plugin/Makefile help/Makefile diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 25e3dc9d..cdcd0bd3 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 e0e3f808..00000000 --- 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} diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index e45b16d8..1783650a 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -22,10 +22,54 @@ BUILT_SOURCES = \ empathy-enum-types.h \ empathy-enum-types.c -lib_LTLIBRARIES = libempathy.la +noinst_LTLIBRARIES = libempathy.la + +libempathy_headers = \ + empathy-account-settings.h \ + empathy-account.h \ + empathy-account-manager.h \ + empathy-chatroom.h \ + empathy-chatroom-manager.h \ + empathy-call-factory.h \ + empathy-call-handler.h \ + empathy-connectivity.h \ + empathy-contact.h \ + empathy-contact-groups.h \ + empathy-contact-list.h \ + empathy-contact-manager.h \ + empathy-contact-monitor.h \ + empathy-connection-managers.h \ + empathy-debug.h \ + empathy-debugger.h \ + empathy-dispatcher.h \ + empathy-dispatch-operation.h \ + empathy-ft-factory.h \ + empathy-ft-handler.h \ + empathy-handler.h \ + empathy-idle.h \ + empathy-irc-network.h \ + empathy-irc-network-manager.h \ + empathy-irc-server.h \ + empathy-location.h \ + empathy-log-manager.h \ + empathy-log-store.h \ + empathy-log-store-empathy.h \ + empathy-message.h \ + empathy-status-presets.h \ + empathy-time.h \ + empathy-tp-call.h \ + empathy-tp-chat.h \ + empathy-tp-contact-factory.h \ + empathy-tp-contact-list.h \ + empathy-tp-file.h \ + empathy-tp-roomlist.h \ + empathy-tube-handler.h \ + empathy-types.h \ + empathy-utils.h libempathy_la_SOURCES = \ - empathy-account.c \ + $(libempathy_headers) \ + empathy-account.c \ empathy-account-settings.c \ empathy-account-manager.c \ empathy-chatroom.c \ @@ -76,64 +120,12 @@ libempathy_la_LIBADD = \ $(NETWORK_MANAGER_LIBS) \ $(CONNMAN_LIBS) -libempathy_la_LDFLAGS = \ - -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} \ - -export-symbols-regex ^empathy_ - -libempathy_headers = \ - empathy-account-settings.h \ - empathy-account.h \ - empathy-account-manager.h \ - empathy-chatroom.h \ - empathy-chatroom-manager.h \ - empathy-call-factory.h \ - empathy-call-handler.h \ - empathy-connectivity.h \ - empathy-contact.h \ - empathy-contact-groups.h \ - empathy-contact-list.h \ - empathy-contact-manager.h \ - empathy-contact-monitor.h \ - empathy-connection-managers.h \ - empathy-debug.h \ - empathy-debugger.h \ - empathy-dispatcher.h \ - empathy-dispatch-operation.h \ - empathy-ft-factory.h \ - empathy-ft-handler.h \ - empathy-handler.h \ - empathy-idle.h \ - empathy-irc-network.h \ - empathy-irc-network-manager.h \ - empathy-irc-server.h \ - empathy-location.h \ - empathy-log-manager.h \ - empathy-log-store.h \ - empathy-log-store-empathy.h \ - empathy-message.h \ - empathy-status-presets.h \ - empathy-time.h \ - empathy-tp-call.h \ - empathy-tp-chat.h \ - empathy-tp-contact-factory.h \ - empathy-tp-contact-list.h \ - empathy-tp-file.h \ - empathy-tp-roomlist.h \ - empathy-tube-handler.h \ - empathy-types.h \ - empathy-utils.h - check_c_sources = \ $(libempathy_la_SOURCES) \ $(libempathy_headers) include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -libempathy_includedir = $(includedir)/libempathy/ -libempathy_include_HEADERS = \ - $(libempathy_headers) \ - empathy-enum-types.h - empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am $(QUIET_GEN)( cd $(srcdir) && \ sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ @@ -205,9 +197,6 @@ ircnetworksdir = $(datadir)/empathy ircnetworks_DATA = \ irc-networks.xml -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libempathy.pc - EXTRA_DIST = \ empathy-marshal.list \ $(stylesheet_DATA) \ diff --git a/libempathy/libempathy.pc.in b/libempathy/libempathy.pc.in deleted file mode 100644 index 6dd89fd5..00000000 --- a/libempathy/libempathy.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libempathy -Description: Empathy base library -Requires: pkg-config >= 0.21 -Requires.private: glib-2.0, gobject-2.0, libxml-2.0, \ - gio-2.0, gio-unix-2.0, telepathy-glib -Version: @VERSION@ -Libs: -L${libdir} -lempathy -Cflags: -I${includedir} |