Merge commit 'cassidy/irc'

[empathy.git] / libempathy-gtk / Makefile.am

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2e9966536202e538f66f6058d5861158d21242cb..f5321517059f61674ad48929e5cdbfad33a07575 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -6,6 +6,9 @@ AM_CPPFLAGS =                                           \
        $(WARN_CFLAGS)
 
 BUILT_SOURCES =                                        \
+       empathy-gtk-marshal.h                           \
+       empathy-gtk-marshal.c                           \
+       empathy-gtk-marshal.list                        \
        empathy-gtk-enum-types.h                        \
        empathy-gtk-enum-types.c
 
@@ -15,23 +18,24 @@ libempathy_gtk_la_SOURCES =                 \
        ephy-spinner.c ephy-spinner.h           \
        empathy-main-window.c                   \
        empathy-status-icon.c                   \
+       empathy-conf.c                          \
        empathy-contact-widget.c                \
        empathy-contact-dialogs.c               \
        empathy-accounts-dialog.c               \
-       empathy-account-widget-generic.c        \
-       empathy-account-widget-jabber.c         \
-       empathy-account-widget-msn.c            \
-       empathy-account-widget-salut.c          \
+       empathy-account-widget.c                \
+       empathy-account-widget-irc.c            \
        empathy-profile-chooser.c               \
        empathy-cell-renderer-expander.c        \
        empathy-cell-renderer-text.c            \
        empathy-cell-renderer-activatable.c     \
        empathy-spell.c                         \
        empathy-spell-dialog.c                  \
-       empathy-contact-groups.c                \
        empathy-contact-list-store.c            \
        empathy-contact-list-view.c             \
        empathy-preferences.c                   \
+       empathy-theme.c                         \
+       empathy-theme-boxes.c                   \
+       empathy-theme-irc.c                     \
        empathy-theme-manager.c                 \
        empathy-smiley-manager.c                \
        empathy-chat-window.c                   \
@@ -40,7 +44,6 @@ libempathy_gtk_la_SOURCES =                   \
        empathy-private-chat.c                  \
        empathy-group-chat.c                    \
        empathy-geometry.c                      \
-       empathy-status-presets.c                \
        empathy-presence-chooser.c              \
        empathy-about-dialog.c                  \
        empathy-account-chooser.c               \
@@ -51,7 +54,9 @@ libempathy_gtk_la_SOURCES =                   \
        empathy-avatar-chooser.c                \
        empathy-avatar-image.c                  \
        empathy-ui-utils.c                      \
-       empathy-new-message-dialog.c
+       empathy-new-message-dialog.c            \
+       empathy-irc-network-dialog.c            \
+       totem-subtitle-encoding.c  totem-subtitle-encoding.h
 
 # do not distribute generated files
 nodist_libempathy_gtk_la_SOURCES =\
@@ -62,29 +67,31 @@ libempathy_gtk_la_LIBADD =                  \
        $(top_builddir)/libempathy/libempathy.la
 
 libempathy_gtk_la_LDFLAGS =                \
-       -version-info ${LIBEMPATHY_GTK_CURRENT}:${LIBEMPATHY_GTK_REVISION}:${LIBEMPATHY_GTK_AGE}
+       -version-info ${LIBEMPATHY_GTK_CURRENT}:${LIBEMPATHY_GTK_REVISION}:${LIBEMPATHY_GTK_AGE} \
+       -export-symbols-regex ^empathy_
 
 libempathy_gtk_headers =                       \
        empathy-images.h                        \
        empathy-main-window.h                   \
        empathy-status-icon.h                   \
+       empathy-conf.h                          \
        empathy-contact-widget.h                \
        empathy-contact-dialogs.h               \
        empathy-accounts-dialog.h               \
-       empathy-account-widget-generic.h        \
-       empathy-account-widget-jabber.h         \
-       empathy-account-widget-msn.h            \
-       empathy-account-widget-salut.h          \
+       empathy-account-widget.h                \
+       empathy-account-widget-irc.h            \
        empathy-profile-chooser.h               \
        empathy-cell-renderer-expander.h        \
        empathy-cell-renderer-text.h            \
        empathy-cell-renderer-activatable.h     \
        empathy-spell.h                         \
        empathy-spell-dialog.h                  \
-       empathy-contact-groups.h                \
        empathy-contact-list-store.h            \
        empathy-contact-list-view.h             \
        empathy-preferences.h                   \
+       empathy-theme.h                         \
+       empathy-theme-boxes.h                   \
+       empathy-theme-irc.h                     \
        empathy-theme-manager.h                 \
        empathy-smiley-manager.h                \
        empathy-chat-window.h                   \
@@ -93,7 +100,6 @@ libempathy_gtk_headers =                     \
        empathy-private-chat.h                  \
        empathy-group-chat.h                    \
        empathy-geometry.h                      \
-       empathy-status-presets.h                \
        empathy-presence-chooser.h              \
        empathy-about-dialog.h                  \
        empathy-account-chooser.h               \
@@ -104,7 +110,8 @@ libempathy_gtk_headers =                    \
        empathy-avatar-chooser.h                \
        empathy-avatar-image.h                  \
        empathy-ui-utils.h                      \
-       empathy-new-message-dialog.h
+       empathy-new-message-dialog.h            \
+       empathy-irc-network-dialog.h
 
 libempathy_gtk_includedir = $(includedir)/libempathy-gtk/
 libempathy_gtk_include_HEADERS =               \
@@ -123,6 +130,7 @@ glade_DATA =                                        \
        empathy-account-widget-jabber.glade     \
        empathy-account-widget-msn.glade        \
        empathy-account-widget-salut.glade      \
+       empathy-account-widget-irc.glade        \
        empathy-new-chatroom-dialog.glade       \
        empathy-group-chat.glade                \
        empathy-chatrooms-window.glade          \
@@ -132,6 +140,24 @@ glade_DATA =                                       \
        empathy-chat.glade                      \
        empathy-new-message-dialog.glade
 
+empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
+       ( cd $(srcdir) && \
+       sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:]]*__[[:upper:]_]*\).*/\1/p' \
+       $(libempathy_gtk_la_SOURCES) ) \
+       | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+       if cmp -s $@.tmp $@; then \
+               rm $@.tmp; \
+       else \
+               mv $@.tmp $@; \
+       fi
+
+%-marshal.h: %-marshal.list Makefile
+       $(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+
+%-marshal.c: %-marshal.list Makefile
+       echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
+       $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
        @true
 stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
@@ -170,17 +196,11 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers)
        && cp xgen-gtc $(@F) \
        && rm -f xgen-gtc
 
-dtddir = $(datadir)/empathy
-dtd_DATA =                                     \
-       empathy-status-presets.dtd              \
-       empathy-contact-groups.dtd
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libempathy-gtk.pc
 
 EXTRA_DIST =                   \
-       $(glade_DATA)           \
-       $(dtd_DATA)
+       $(glade_DATA)
 
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \