Modify Makefile.am for new file names

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index faf9cd4741453813ffec528b356732b08d8ced4a..4b1541312e7ac3df189c88049a84fa84dd4ab332 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,14 @@
 AM_CPPFLAGS =                                          \
        -I$(top_srcdir)                                 \
        $(EMPATHY_CFLAGS)                               \
+       $(LIBNOTIFY_CFLAGS)                             \
        $(WARN_CFLAGS)
 
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
        $(top_builddir)/extensions/libemp-extensions.la         \
+       $(LIBNOTIFY_LIBS)                                       \
        $(EMPATHY_LIBS)
 
 bin_PROGRAMS =                 \
@@ -14,9 +16,6 @@ bin_PROGRAMS =                        \
        empathy-logs
 
 BUILT_SOURCES= \
-       empathy-marshal.h \
-       empathy-marshal.c \
-       empathy-marshal.list \
        empathy-tube-dispatch-enumtypes.h \
        empathy-tube-dispatch-enumtypes.c
 
@@ -33,8 +32,10 @@ empathy_SOURCES =                                                    \
        empathy-import-dialog.c empathy-import-dialog.h                 \
        empathy-import-pidgin.c empathy-import-pidgin.h                 \
        empathy-main-window.c empathy-main-window.h                     \
+       empathy-misc.c empathy-misc.h                                   \
        empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h     \
        empathy-preferences.c empathy-preferences.h                     \
+       empathy-sidebar.c empathy-sidebar.h                     \
        empathy-status-icon.c empathy-status-icon.h                     \
        empathy-tube-dispatch.c empathy-tube-dispatch.h                 \
        ephy-spinner.c ephy-spinner.h
@@ -43,40 +44,22 @@ 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
 
-empathy-marshal.list: $(empathy_SOURCES) Makefile.am
-       ( cd $(srcdir) && \
-       sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-       $(empathy_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-marshal.h\"" > $@ && \
-       $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
        glib-mkenums \
@@ -97,7 +80,7 @@ empathy-marshal.list: $(empathy_SOURCES) Makefile.am
 
 EXTRA_DIST =                   \
        $(autostart_DATA)       \
-       $(glade_DATA)
+       $(ui_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)