[ekiga] Fix make dist

[Eugen Dedu <ededu src gnome org>]

commit d4392a411b7c8a10e447296ee10a3c15217424a2
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Dec 20 02:55:11 2010 +0100

    Fix make dist

 Makefile.am      |    9 ++++++++-
 help/Makefile.am |   44 +++++++++++++++++++++++++++-----------------
 lib/Makefile.am  |    8 ++++++--
 3 files changed, 41 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6d2c995..5c22107 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,12 +33,20 @@ WIN32_DIST = \
         win32/directx/mingw_dshow_port.h                        \
         win32/directx/strmif.h                                  \
         win32/directx/uuids.h                                   \
+        win32/diff/README                                       \
+        win32/diff/ekiga_sticonmenu1.patch                      \
+        win32/diff/ekiga_sticonmenu2.patch                      \
+        win32/diff/ekiga_sticonmenu3.patch                      \
+        win32/diff/ptlib_private.patch                          \
 	win32/ekiga-rc.rc					\
 	win32/Makefile						\
 	win32/nsisinstaller/ekiga.nsi				\
 	win32/nsisinstaller/language_files/hungarian.nsh	\
 	win32/nsisinstaller/language_files/english.nsh		\
 	win32/nsisinstaller/language_files/french.nsh		\
+	win32/nsisinstaller/language_files/dutch.nsh		\
+	win32/nsisinstaller/language_files/romanian.nsh		\
+	win32/nsisinstaller/language_files/russian.nsh		\
 	win32/nsisinstaller/langmacros.nsh
 
 
@@ -52,7 +60,6 @@ EXTRA_DIST = \
         LICENSE                                                 \
         MAINTAINERS                                             \
 	$(SCHEMAS_FILE) 					\
-	lib/gmmarshallers.list					\
 	$(WIN32_DIST)
 
 Applicationsdir = $(datadir)/applications
diff --git a/help/Makefile.am b/help/Makefile.am
index f597b5b..38fc2d4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -8,21 +8,31 @@ dist-hook: doc-dist-hook
 
 # Keeping PACKAGE_NAME to be able to install stable and snapshot in parallel
 DOC_MODULE = @PACKAGE_NAME@
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-DOC_FIGURES = figures/lumi.png        \
-              figures/config_d1.png   \
-              figures/config_d2.png   \
-              figures/config_d3.png   \
-              figures/config_d4.png   \
-              figures/config_d5.png   \
-              figures/config_d6.png   \
-              figures/config_d7.png   \
-              figures/config_d8.png   \
-              figures/call_d1.png     \
-              figures/accounts_d1.png    \
-              figures/accounts_sip.png   \
-              figures/accounts_h323.png  \
-              figures/audio_codecs.png
-              
+DOC_ENTITIES =
+DOC_INCLUDES =
+DOC_FIGURES = figures/lumi.png \
+              figures/config_d1.png \
+              figures/config_d2.png \
+              figures/config_d3.png \
+              figures/config_d4.png \
+              figures/config_d5.png \
+              figures/config_d6.png \
+              figures/config_d7.png \
+              figures/config_d8.png \
+              figures/call_d1.png \
+              figures/roster.png \
+              figures/addressbook_d1.png \
+              figures/addressbook_d2.png \
+              figures/chat_d1.png \
+              figures/status.png \
+              figures/call_history.png \
+              figures/accounts_d1.png \
+              figures/accounts_ekiga_net.png \
+              figures/accounts_ekiga_call_out.png \
+              figures/accounts_sip.png \
+              figures/accounts_h323.png \
+              figures/monitoring_lines.png \
+              figures/audio_codecs.png \
+              figures/video_codecs.png
+
 DOC_LINGUAS = bg ca de el en_GB es eu fi fr oc pt_BR ru sl sv uk zh_CN
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7811dc0..ededfac 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -70,9 +70,11 @@ components_dir = $(top_srcdir)/lib/engine/components
 # Sources out of this directory
 ##
 
-libekiga_la_SOURCES += \
+nodist_libekiga_la_SOURCES = \
 	gmmarshallers.c \
 	gmmarshallers.h
+CLEANFILES += gmmarshallers.c gmmarshallers.h
+EXTRA_DIST = gmmarshallers.list
 
 # forces the HAVE :
 BUILT_SOURCES = gmmarshallers.h gmmarshallers.c
@@ -122,6 +124,7 @@ endif
 if !WIN32
 
 INCLUDES += -I$(top_srcdir)/lib/pixops
+EXTRA_DIST += $(top_srcdir)/lib/pixops/README
 
 libekiga_la_SOURCES += \
 	$(top_srcdir)/lib/pixops/pixops.h \
@@ -638,7 +641,7 @@ libekiga_la_SOURCES += \
 	$(components_dir)/hal-dbus/hal-v4l-helper.c
 endif
 
-nodist_libekiga_la_SOURCES = \
+nodist_libekiga_la_SOURCES += \
 	$(builddir)/hal-marshal.h \
 	$(builddir)/hal-marshal.c
 
@@ -647,6 +650,7 @@ libekiga_la_LDFLAGS += $(DBUS_LIBS)
 # forces the HAVE :
 BUILT_SOURCES += $(builddir)/hal-marshal.h $(builddir)/hal-marshal.c
 CLEANFILES += $(builddir)/hal-marshal.h $(builddir)/hal-marshal.c
+EXTRA_DIST += $(components_dir)/hal-dbus/hal-marshal.list
 
 $(builddir)/hal-marshal.h: $(components_dir)/hal-dbus/hal-marshal.list
 	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $  tmp && mv $  tmp $@