ekiga r7128 - in branches/gnome-2-24: . lib/engine/gui/gtk-frontend pixmaps po src src/devices

[dsandras svn gnome org]

Author: dsandras
Date: Mon Sep 29 18:58:54 2008
New Revision: 7128
URL: http://svn.gnome.org/viewvc/ekiga?rev=7128&view=rev

Log:
Backport from TRUNK to fix make distcheck. Also fixes #553813.


Removed:
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window-old.cpp
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window-old.h
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window-page.cpp
   branches/gnome-2-24/lib/engine/gui/gtk-frontend/chat-window-page.h
   branches/gnome-2-24/src/devices/audio.cpp
   branches/gnome-2-24/src/devices/audio.h
Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/Makefile.am
   branches/gnome-2-24/pixmaps/Makefile.am
   branches/gnome-2-24/po/POTFILES.in
   branches/gnome-2-24/src/Makefile.am

Modified: branches/gnome-2-24/Makefile.am
==============================================================================
--- branches/gnome-2-24/Makefile.am	(original)
+++ branches/gnome-2-24/Makefile.am	Mon Sep 29 18:58:54 2008
@@ -52,8 +52,7 @@
 
 
 ### Dist Clear
-DISTCLEANFILES=gnome-doc-utils.make 
-
+DISTCLEANFILES=gnome-doc-utils.make ekiga.desktop ekiga.schemas
 
 ### Install the schemas file in /etc if GCONF support is not compiled in,
 ### and do not install the schemas at all

Modified: branches/gnome-2-24/pixmaps/Makefile.am
==============================================================================
--- branches/gnome-2-24/pixmaps/Makefile.am	(original)
+++ branches/gnome-2-24/pixmaps/Makefile.am	Mon Sep 29 18:58:54 2008
@@ -106,6 +106,10 @@
 
 noinst_DATA = inlines.h
 
+BUILD_SOURCES = inlines.h
+
+CLEANFILES = inlines.h
+
 EXTRA_DIST= $(IMAGES_FILES)
 
 inlines.h: $(IMAGE_FILES) $(nobase_dist_icon_DATA) Makefile.am

Modified: branches/gnome-2-24/po/POTFILES.in
==============================================================================
--- branches/gnome-2-24/po/POTFILES.in	(original)
+++ branches/gnome-2-24/po/POTFILES.in	Mon Sep 29 18:58:54 2008
@@ -9,21 +9,18 @@
 lib/engine/addressbook/ldap/ldap-book.cpp
 lib/engine/addressbook/skel/contact-core.cpp
 lib/engine/gui/gtk-frontend/addressbook-window.cpp
+lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
 lib/engine/gui/gtk-frontend/chat-area.cpp
-lib/engine/gui/gtk-frontend/chat-window-old.cpp
+lib/engine/gui/gtk-frontend/chat-window.cpp
 lib/engine/gui/gtk-frontend/gtk-frontend.cpp
-lib/engine/gui/gtk-frontend/book-view-gtk.cpp
 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
-lib/engine/gui/gtk-frontend/chat-window-page.cpp
-lib/engine/gui/gtk-frontend/chat-window.cpp
-lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
 lib/engine/presence/avahi/avahi-heap.cpp
 lib/engine/presence/local-roster/local-presentity.cpp
 lib/engine/presence/local-roster/local-roster-bridge.cpp
 lib/engine/presence/local-roster/local-heap.cpp
 lib/gui/codecsbox.cpp
 lib/gui/gmdialog.c
-src/devices/audio.cpp
 src/devices/videoinput.cpp
 src/endpoints/ekiga.cpp
 src/endpoints/h323-endpoint.cpp

Modified: branches/gnome-2-24/src/Makefile.am
==============================================================================
--- branches/gnome-2-24/src/Makefile.am	(original)
+++ branches/gnome-2-24/src/Makefile.am	Mon Sep 29 18:58:54 2008
@@ -28,6 +28,8 @@
 	$(GNOME_INCLUDEDIR)				\
 	-DSCHEMA_AGE= SCHEMA_AGE@ 
 
+BUILT_SOURCES = src/revision.h
+
 # XVideo/X
 if !WIN32
 INCLUDES +=                   				\
@@ -139,7 +141,7 @@
 
 ekiga_helper_LDADD = $(DBUS_LIBS)
 
-BUILT_SOURCES = components/dbus-helper-stub.h components/dbus-stub.h
+BUILT_SOURCES += components/dbus-helper-stub.h components/dbus-stub.h
 
 components/dbus-helper-stub.h: components/dbus-helper-stub.xml
 	$(LIBTOOL) --mode=execute dbus-binding-tool --prefix=helper --mode=glib-server --output=$@ $^
@@ -163,6 +165,7 @@
 SVN_REVISION=$(shell head ../.svn/entries -n11 2>/dev/null | tail -n1)
 CACHED_REVISION=$(shell cat revision.h 2>/dev/null | cut -c24-)
 
+src/revision.h:
 $(shell if test -e "../.svn/entries"; then \
           if test "x$(SVN_REVISION)" != "x$(CACHED_REVISION)"; then \
             echo "#define EKIGA_REVISION $(SVN_REVISION)" > revision.h; \
@@ -186,3 +189,5 @@
 
 CLEANFILES = \
 	$(service_DATA)
+
+DISTCLEANFILES = src/revision.h
\ No newline at end of file