Modify Makefile.am for new file names

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2848

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index c7b02310026429a0594e10ba77960c61edf20b0a..c192affef780aff9045e0ef7a48c3d9d681f526f 100644 (file)
--- 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
 
        $(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) && \
 
 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 =                   \
 pkgconfig_DATA = libempathy-gtk.pc
 
 EXTRA_DIST =                   \

-       $(glade_DATA)
+       $(ui_DATA)

 
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \
 
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \

diff --git a/src/Makefile.am b/src/Makefile.am
index a49bfc5ad9b12a95462639555755201b6f2299c9..4b1541312e7ac3df189c88049a84fa84dd4ab332 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,18 +44,18 @@ nodist_empathy_SOURCES = $(BUILT_SOURCES)
 
 empathy_logs_SOURCES = empathy-logs.c
 
 
 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
 
 dist_man_MANS =                        \
        empathy.1


@@ -80,7 +80,7 @@ dist_man_MANS =                       \
 
 EXTRA_DIST =                   \
        $(autostart_DATA)       \
 
 EXTRA_DIST =                   \
        $(autostart_DATA)       \

-       $(glade_DATA)
+       $(ui_DATA)

 
 CLEANFILES = $(BUILT_SOURCES)
 
 
 CLEANFILES = $(BUILT_SOURCES)