ekiga r7494 - trunk

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jan  4 12:55:42 2009
New Revision: 7494
URL: http://svn.gnome.org/viewvc/ekiga?rev=7494&view=rev

Log:
A few make dist fixes as suggested by Eugen.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jan  4 12:55:42 2009
@@ -10,22 +10,35 @@
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
+DESKTOP_IN_IN_FILES= PACKAGE_NAME@.desktop.in.in
 DESKTOP_IN_FILES= PACKAGE_NAME@.desktop.in
 DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 
+SCHEMAS_IN_IN_FILE = @PACKAGE_NAME  schemas in in
 SCHEMAS_FILE = @PACKAGE_NAME  schemas
 
 
 ### Win32 files
 WIN32_DIST = \
 	win32/ico/ekiga.ico					\
-	win32/ico/ekiga-uninstall.ico					\
+	win32/ico/ekiga-uninstall.ico				\
 	win32/diff/opal_opal.pc.in				\
 	win32/diff/ptlib_Makefile.am				\
+        win32/diff/ptlib_ptlib.pc.in                            \
 	win32/diff/opal_configure.ac				\
 	win32/diff/opal_Makefile.am				\
 	win32/diff/ptlib_configure.ac				\
 	win32/diff/ptlib_pwlib.pc.in				\
+        win32/directx/Amvideo.h                                 \
+        win32/directx/control.h                                 \
+        win32/directx/ddraw.h                                   \
+        win32/directx/dshow.h                                   \
+        win32/directx/dsound.h                                  \
+        win32/directx/dxerr9.h                                  \
+        win32/directx/ksuuids.h                                 \
+        win32/directx/mingw_dshow_port.h                        \
+        win32/directx/strmif.h                                  \
+        win32/directx/uuids.h                                   \
 	ekiga.rc						\
 	win32/Makefile						\
 	win32/nsisinstaller/ekiga.nsi				\
@@ -37,13 +50,12 @@
 
 ### Extra dist
 EXTRA_DIST = \
-	$(DESKTOP_IN_FILES)					\
-	$(DESKTOP_FILES)					\
+	$(DESKTOP_IN_IN_FILES)					\
         doc/                                                    \
 	gnome-doc-utils.make					\
 	FAQ							\
 	README							\
-	$(SCHEMAS_FILE)						\
+	$(SCHEMAS_IN_IN_FILE)					\
 	gnome-doc-utils.make					\
 	lib/gmmarshallers.list					\
 	$(WIN32_DIST)