Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--cut-n-paste/Makefile.am5
-rw-r--r--sugar/Makefile.am3
-rw-r--r--sugar/browser/Makefile.am1
-rw-r--r--sugar/chat/Makefile.am18
-rw-r--r--sugar/p2p/Makefile.am5
-rw-r--r--sugar/presence/Makefile.am9
-rw-r--r--sugar/shell/Makefile.am13
9 files changed, 26 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am
index 4fa44db..a35c559 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 ed290eb..6ed84b9 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 0000000..e608554
--- /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 8123484..eb28f89 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 5a709c0..2c66e22 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 53d2eed..0d9eaae 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 224bc3c..47ce926 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 6987fef..dc556ba 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 54da99c..1080b7d 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