diff options
| -rw-r--r-- | data/Makefile.am | 10 | ||||
| -rw-r--r-- | data/empathy.desktop.in (renamed from src/empathy.desktop.in) | 4 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 8 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 35 |
5 files changed, 39 insertions, 24 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 0f2e1b074..06f7e87a6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -20,8 +20,14 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi -EXTRA_DIST = \ - $(image_DATA) \ +autostartdir = $(datadir)/gnome/autostart +autostart_in_files = empathy.desktop.in +autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +EXTRA_DIST = \ + $(image_DATA) \ + $(autostart_DATA) \ $(profile_DATA) diff --git a/src/empathy.desktop.in b/data/empathy.desktop.in index 3e0ea16b8..1729f427e 100644 --- a/src/empathy.desktop.in +++ b/data/empathy.desktop.in @@ -2,10 +2,10 @@ Encoding=UTF-8 _Name=Empathy _Comment=Gnome Instant Messaging Client -Icon= +Icon=empathy Exec=empathy Terminal=false Type=Application -Categories=Internet +Categories=GNOME;GTK;Network;InstantMessaging; OnlyShowIn=GNOME diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index b18845a17..bd8abcc2b 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -4,10 +4,6 @@ AM_CPPFLAGS = \ $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) -AM_LDFLAGS = \ - $(top_builddir)/libempathy/libempathy.la \ - $(EMPATHY_LIBS) - noinst_LTLIBRARIES = libempathy-gtk.la libempathy_gtk_la_SOURCES = \ @@ -34,6 +30,10 @@ libempathy_gtk_la_SOURCES = \ gossip-presence-chooser.c gossip-presence-chooser.h \ gossip-ui-utils.c gossip-ui-utils.h +libempathy_gtk_la_LIBADD = \ + $(EMPATHY_LIBS) \ + $(top_builddir)/libempathy/libempathy.la + libempathy_gtk_includedir = $(includedir)/empathy/ gladedir = $(datadir)/empathy diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 629fc3663..9ce202733 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -6,9 +6,6 @@ AM_CPPFLAGS = \ $(LIBEMPATHY_CFLAGS) \ $(WARN_CFLAGS) -AM_LDFLAGS = \ - $(LIBEMPATHY_LIBS) - BUILT_SOURCES = \ empathy-marshal.h \ empathy-marshal.c \ @@ -33,6 +30,9 @@ libempathy_la_SOURCES = \ empathy-chandler.c empathy-chandler.h \ empathy-marshal-main.c +libempathy_la_LIBADD = \ + $(LIBEMPATHY_LIBS) + libempathy_includedir = $(includedir)/empathy/ %-marshal.h: %-marshal.list Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 2eb2d0286..8b9e63a19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,28 +1,42 @@ -AM_CPPFLAGS = \ - -I. \ - -I$(top_srcdir) \ - $(EMPATHY_CFLAGS) \ +cppflags = \ + -I. \ + -I$(top_srcdir) \ + $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) -AM_LDFLAGS = \ - $(top_builddir)/libempathy/libempathy.la \ +libs = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(EMPATHY_LIBS) -bin_PROGRAMS = empathy empathy-accounts empathy-chat empathy-contact-list +bin_PROGRAMS = \ + empathy \ + empathy-chat \ + empathy-accounts \ + empathy-contact-list empathy_SOURCES = \ empathy-main.c \ empathy-filter.c empathy-filter.h +empathy_CPPFLAGS = $(cppflags) +empathy_LDADD = $(libs) + empathy_accounts_SOURCES = empathy-accounts-main.c +empathy_accounts_CPPFLAGS = $(cppflags) +empathy_accounts_LDADD = $(libs) + empathy_chat_SOURCES = empathy-chat-main.c +empathy_chat_CPPFLAGS = $(cppflags) +empathy_chat_LDADD = $(libs) + empathy_contact_list_SOURCES = empathy-contact-list-main.c +empathy_contact_list_CPPFLAGS = $(cppflags) +empathy_contact_list_LDADD = $(libs) # MC plugin #pluginlib_LTLIBRARIES = libempathy-filter-plugin.la #libempathy_filter_plugin_la_SOURCES = empathy-filter-plugin.c #libempathy_filter_plugin_la_CPPFLAGS = $(MISSION_CONTROL_PLUGINS_CFLAGS) -#libempathy_filter_plugin_la_LDFLAGS = $(MISSION_CONTROL_PLUGINS_LIBS) +#libempathy_filter_plugin_la_LIBADD = $(MISSION_CONTROL_PLUGINS_LIBS) # Dbus service file servicedir = $(datadir)/dbus-1/services @@ -36,11 +50,6 @@ $(service_DATA): $(service_in_files) Makefile chandlerdir = $(datadir)/telepathy/managers chandler_DATA = empathy-chat.chandler -autostartdir = $(datadir)/gnome/autostart -autostart_in_files = empathy.desktop.in -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - # Empathy filter DBus API empathy-filter-glue.h: empathy-filter.xml $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=empathy_filter --mode=glib-server --output=$@ $< |