From f2ae13241052c94c18131c3db3f255b22f60a5df Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Thu, 15 Jun 2006 08:38:21 -0400
Subject: [PATCH] Fix a bunch of outdated makefiles.

---
 Makefile.am                |  2 +-
 configure.ac               |  1 +
 cut-n-paste/Makefile.am    |  5 +++++
 sugar/Makefile.am          |  3 ++-
 sugar/browser/Makefile.am  |  1 -
 sugar/chat/Makefile.am     | 18 +++++-------------
 sugar/p2p/Makefile.am      |  5 +----
 sugar/presence/Makefile.am |  9 ++++-----
 sugar/shell/Makefile.am    | 13 +++++++------
 9 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 cut-n-paste/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4fa44db3..a35c559f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = sugar
+SUBDIRS = sugar cut-n-paste
diff --git a/configure.ac b/configure.ac
index ed290eb6..6ed84b9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ AC_SUBST(PYGTK_LIBS)
 
 AC_OUTPUT([
 Makefile
+cut-n-paste/Makefile
 sugar/Makefile
 sugar/__installed__.py
 sugar/browser/Makefile
diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am
new file mode 100644
index 00000000..e6085547
--- /dev/null
+++ b/cut-n-paste/Makefile.am
@@ -0,0 +1,5 @@
+cut_n_pastedir = $(pythondir)/cut-n-paste
+cut_n_paste_PYTHON =		\
+	google.py		\
+	GoogleSOAPFacade.py	\
+	SOAP.py
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 81234841..eb28f89a 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -6,6 +6,7 @@ sugardir = $(pythondir)/sugar
 sugar_PYTHON =			\
 	__init__.py		\
 	__installed__.py	\
-	env.py
+	env.py			\
+	util.py
 
 EXTRA_DIST = sugar __uninstalled__.py
diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am
index 5a709c00..2c66e222 100644
--- a/sugar/browser/Makefile.am
+++ b/sugar/browser/Makefile.am
@@ -4,7 +4,6 @@ sugar_PYTHON =			\
 	browser.py		\
 	NotificationBar.py	\
 	BrowserShell.py         \
-	WebActivity.py          \
 	AddressItem.py          \
 	BrowserActivity.py      \
 	NavigationToolbar.py
diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am
index 53d2eedb..0d9eaae2 100644
--- a/sugar/chat/Makefile.am
+++ b/sugar/chat/Makefile.am
@@ -3,18 +3,10 @@ SUBDIRS = sketchpad
 sugardir = $(pythondir)/sugar/chat
 sugar_PYTHON =		\
 	__init__.py	\
-	chat.py		\
-	richtext.py	\
-	Emoticons.py
-
-icondir = $(pkgdatadir)
-icon_DATA =			\
-	bubble.png		\
-	bubbleOutline.png
-
-activitydir = $(pkgdatadir)/activities
-activity_DATA = chat.activity
+	Chat.py		\
+	Emoticons.py	\
+	GroupChat.py	\
+	richtext.py
 
 EXTRA_DIST = \
-	$(icon_DATA)		\
-	$(activity_DATA)
+	$(icon_DATA)
diff --git a/sugar/p2p/Makefile.am b/sugar/p2p/Makefile.am
index 224bc3cd..47ce9262 100644
--- a/sugar/p2p/Makefile.am
+++ b/sugar/p2p/Makefile.am
@@ -3,12 +3,9 @@ SUBDIRS = model
 sugardir = $(pythondir)/sugar/p2p
 sugar_PYTHON =			\
 	__init__.py		\
-	Buddy.py		\
-	Group.py		\
 	NotificationListener.py	\
 	Notifier.py		\
-	Service.py		\
 	Stream.py		\
-	MostlyReliablePipe.py \
+	MostlyReliablePipe.py	\
 	network.py		\
 	presence.py
diff --git a/sugar/presence/Makefile.am b/sugar/presence/Makefile.am
index 6987fef6..dc556bab 100644
--- a/sugar/presence/Makefile.am
+++ b/sugar/presence/Makefile.am
@@ -1,7 +1,6 @@
 sugardir = $(pythondir)/sugar/presence
-sugar_PYTHON =		\
-	__init__.py	\
-	Buddy.py \
-	Group.py \
-	PresenceService.py \
+sugar_PYTHON =			\
+	__init__.py		\
+	Buddy.py		\
+	PresenceService.py	\
 	Service.py
diff --git a/sugar/shell/Makefile.am b/sugar/shell/Makefile.am
index 54da99c3..1080b7d6 100644
--- a/sugar/shell/Makefile.am
+++ b/sugar/shell/Makefile.am
@@ -1,7 +1,8 @@
 sugardir = $(pythondir)/sugar/shell
-sugar_PYTHON =		\
-	__init__.py	\
-	activity.py	\
-	shell.py        \
-	PresenceWindow.py \
-	Owner.py
+sugar_PYTHON =			\
+	__init__.py		\
+	activity.py		\
+	shell.py        	\
+	Owner.py		\
+	PresenceWindow.py 	\
+	StartPage.py