From 5c6cafa4c91141da61a5d505d7911f7bb7faf568 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 16 Apr 2009 12:28:14 +0000 Subject: [PATCH] Modify Makefile.am for new file names From: Xavier Claessens svn path=/trunk/; revision=2848 --- libempathy-gtk/Makefile.am | 40 +++++++++++++++++++------------------- src/Makefile.am | 26 ++++++++++++------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index c7b02310..c192affe 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -112,25 +112,25 @@ libempathy_gtk_include_HEADERS = \ $(libempathy_gtk_headers) \ empathy-gtk-enum-types.h -gladedir = $(datadir)/empathy -glade_DATA = \ - empathy-contact-widget.glade \ - empathy-contact-dialogs.glade \ - empathy-presence-chooser.glade \ - empathy-account-widget-generic.glade \ - empathy-account-widget-jabber.glade \ - empathy-account-widget-msn.glade \ - empathy-account-widget-sip.glade \ - empathy-account-widget-salut.glade \ - empathy-account-widget-irc.glade \ - empathy-account-widget-icq.glade \ - empathy-account-widget-yahoo.glade \ - empathy-account-widget-groupwise.glade \ - empathy-account-widget-aim.glade \ - empathy-spell-dialog.glade \ - empathy-log-window.glade \ - empathy-chat.glade \ - empathy-new-message-dialog.glade +uidir = $(datadir)/empathy +ui_DATA = \ + empathy-contact-widget.ui \ + empathy-contact-dialogs.ui \ + empathy-presence-chooser.ui \ + empathy-account-widget-generic.ui \ + empathy-account-widget-jabber.ui \ + empathy-account-widget-msn.ui \ + empathy-account-widget-sip.ui \ + empathy-account-widget-salut.ui \ + empathy-account-widget-irc.ui \ + empathy-account-widget-icq.ui \ + empathy-account-widget-yahoo.ui \ + empathy-account-widget-groupwise.ui \ + empathy-account-widget-aim.ui \ + empathy-spell-dialog.ui \ + empathy-log-window.ui \ + empathy-chat.ui \ + empathy-new-message-dialog.ui empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am ( cd $(srcdir) && \ @@ -192,7 +192,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libempathy-gtk.pc EXTRA_DIST = \ - $(glade_DATA) + $(ui_DATA) CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/src/Makefile.am b/src/Makefile.am index a49bfc5a..4b154131 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,18 +44,18 @@ nodist_empathy_SOURCES = $(BUILT_SOURCES) empathy_logs_SOURCES = empathy-logs.c -gladedir = $(datadir)/empathy -glade_DATA = \ - empathy-accounts-dialog.glade \ - empathy-call-window.glade \ - empathy-chatrooms-window.glade \ - empathy-chat-window.glade \ - empathy-ft-manager.glade \ - empathy-import-dialog.glade \ - empathy-main-window.glade \ - empathy-new-chatroom-dialog.glade \ - empathy-preferences.glade \ - empathy-status-icon.glade +uidir = $(datadir)/empathy +ui_DATA = \ + empathy-accounts-dialog.ui \ + empathy-call-window.ui \ + empathy-chatrooms-window.ui \ + empathy-chat-window.ui \ + empathy-ft-manager.ui \ + empathy-import-dialog.ui \ + empathy-main-window.ui \ + empathy-new-chatroom-dialog.ui \ + empathy-preferences.ui \ + empathy-status-icon.ui dist_man_MANS = \ empathy.1 @@ -80,7 +80,7 @@ dist_man_MANS = \ EXTRA_DIST = \ $(autostart_DATA) \ - $(glade_DATA) + $(ui_DATA) CLEANFILES = $(BUILT_SOURCES) -- 2.39.2