Use a src directory consistently with base and shell.

16 years ago · 72c2a1d770
parent 6efdf259b6
commit 72c2a1d770
78 changed files with 9 additions and 8 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -10,4 +10,4 @@ EXTRA_DIST =                    \
 	intltool-update.in      \
 	intltool-extract.in
-SUBDIRS = po sugar
+SUBDIRS = src po
--- a/configure.ac
+++ b/configure.ac
@ -33,12 +33,13 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
-sugar/Makefile
+src/Makefile
-sugar/activity/Makefile
+src/sugar/Makefile
-sugar/bundle/Makefile
+src/sugar/activity/Makefile
-sugar/clipboard/Makefile
+src/sugar/bundle/Makefile
-sugar/graphics/Makefile
+src/sugar/clipboard/Makefile
-sugar/presence/Makefile
+src/sugar/graphics/Makefile
-sugar/datastore/Makefile
+src/sugar/presence/Makefile
 src/sugar/datastore/Makefile
 po/Makefile.in
 ])
--- a/src/sugar/.gitignore
+++ b/src/sugar/.gitignore
--- a/src/sugar/.license
+++ b/src/sugar/.license
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
--- a/src/sugar/_sugarext.defs
+++ b/src/sugar/_sugarext.defs
--- a/src/sugar/_sugarext.override
+++ b/src/sugar/_sugarext.override
--- a/src/sugar/_sugarextmodule.c
+++ b/src/sugar/_sugarextmodule.c
--- a/src/sugar/activity/Makefile.am
+++ b/src/sugar/activity/Makefile.am
--- a/src/sugar/activity/init.py
+++ b/src/sugar/activity/init.py
--- a/src/sugar/activity/initpy
+++ b/src/sugar/activity/initpy
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
--- a/src/sugar/activity/activityhandle.py
+++ b/src/sugar/activity/activityhandle.py
--- a/src/sugar/activity/activityservice.py
+++ b/src/sugar/activity/activityservice.py
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
--- a/src/sugar/activity/registry.py
+++ b/src/sugar/activity/registry.py
--- a/src/sugar/bundle/Makefile.am
+++ b/src/sugar/bundle/Makefile.am
--- a/src/sugar/bundle/init.py
+++ b/src/sugar/bundle/init.py
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
--- a/src/sugar/bundle/bundle.py
+++ b/src/sugar/bundle/bundle.py
--- a/src/sugar/bundle/contentbundle.py
+++ b/src/sugar/bundle/contentbundle.py
--- a/src/sugar/clipboard/Makefile.am
+++ b/src/sugar/clipboard/Makefile.am
--- a/src/sugar/clipboard/init.py
+++ b/src/sugar/clipboard/init.py
--- a/src/sugar/clipboard/clipboardservice.py
+++ b/src/sugar/clipboard/clipboardservice.py
--- a/src/sugar/datastore/Makefile.am
+++ b/src/sugar/datastore/Makefile.am
--- a/src/sugar/datastore/init.py
+++ b/src/sugar/datastore/init.py
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar/datastore/datastore.py
--- a/src/sugar/datastore/dbus_helpers.py
+++ b/src/sugar/datastore/dbus_helpers.py
--- a/src/sugar/eggaccelerators.c
+++ b/src/sugar/eggaccelerators.c
--- a/src/sugar/eggaccelerators.h
+++ b/src/sugar/eggaccelerators.h
--- a/src/sugar/env.py
+++ b/src/sugar/env.py
--- a/src/sugar/graphics/Makefile.am
+++ b/src/sugar/graphics/Makefile.am
--- a/src/sugar/graphics/init.py
+++ b/src/sugar/graphics/init.py
--- a/src/sugar/graphics/alert.py
+++ b/src/sugar/graphics/alert.py
--- a/src/sugar/graphics/animator.py
+++ b/src/sugar/graphics/animator.py
--- a/src/sugar/graphics/combobox.py
+++ b/src/sugar/graphics/combobox.py
--- a/src/sugar/graphics/entry.py
+++ b/src/sugar/graphics/entry.py
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar/graphics/icon.py
--- a/src/sugar/graphics/iconentry.py
+++ b/src/sugar/graphics/iconentry.py
--- a/src/sugar/graphics/menuitem.py
+++ b/src/sugar/graphics/menuitem.py
--- a/src/sugar/graphics/notebook.py
+++ b/src/sugar/graphics/notebook.py
--- a/src/sugar/graphics/objectchooser.py
+++ b/src/sugar/graphics/objectchooser.py
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar/graphics/palette.py
--- a/src/sugar/graphics/palettegroup.py
+++ b/src/sugar/graphics/palettegroup.py
--- a/src/sugar/graphics/panel.py
+++ b/src/sugar/graphics/panel.py
--- a/src/sugar/graphics/radiotoolbutton.py
+++ b/src/sugar/graphics/radiotoolbutton.py
--- a/src/sugar/graphics/roundbox.py
+++ b/src/sugar/graphics/roundbox.py
--- a/src/sugar/graphics/style.py
+++ b/src/sugar/graphics/style.py
--- a/src/sugar/graphics/toggletoolbutton.py
+++ b/src/sugar/graphics/toggletoolbutton.py
--- a/src/sugar/graphics/toolbox.py
+++ b/src/sugar/graphics/toolbox.py
--- a/src/sugar/graphics/toolbutton.py
+++ b/src/sugar/graphics/toolbutton.py
--- a/src/sugar/graphics/toolcombobox.py
+++ b/src/sugar/graphics/toolcombobox.py
--- a/src/sugar/graphics/tray.py
+++ b/src/sugar/graphics/tray.py
--- a/src/sugar/graphics/window.py
+++ b/src/sugar/graphics/window.py
--- a/src/sugar/graphics/xocolor.py
+++ b/src/sugar/graphics/xocolor.py
--- a/src/sugar/network.py
+++ b/src/sugar/network.py
--- a/src/sugar/presence/Makefile.am
+++ b/src/sugar/presence/Makefile.am
--- a/src/sugar/presence/init.py
+++ b/src/sugar/presence/init.py
--- a/src/sugar/presence/activity.py
+++ b/src/sugar/presence/activity.py
--- a/src/sugar/presence/buddy.py
+++ b/src/sugar/presence/buddy.py
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
--- a/src/sugar/presence/test_presence.txt
+++ b/src/sugar/presence/test_presence.txt
--- a/src/sugar/presence/tubeconn.py
+++ b/src/sugar/presence/tubeconn.py
--- a/src/sugar/profile.py
+++ b/src/sugar/profile.py
--- a/src/sugar/sexy-icon-entry.c
+++ b/src/sugar/sexy-icon-entry.c
--- a/src/sugar/sexy-icon-entry.h
+++ b/src/sugar/sexy-icon-entry.h
--- a/src/sugar/sugar-address-entry.c
+++ b/src/sugar/sugar-address-entry.c
--- a/src/sugar/sugar-address-entry.h
+++ b/src/sugar/sugar-address-entry.h
--- a/src/sugar/sugar-key-grabber.c
+++ b/src/sugar/sugar-key-grabber.c
--- a/src/sugar/sugar-key-grabber.h
+++ b/src/sugar/sugar-key-grabber.h
--- a/src/sugar/sugar-marshal.list
+++ b/src/sugar/sugar-marshal.list
--- a/src/sugar/sugar-menu.c
+++ b/src/sugar/sugar-menu.c
--- a/src/sugar/sugar-menu.h
+++ b/src/sugar/sugar-menu.h
--- a/src/sugar/sugar-preview.c
+++ b/src/sugar/sugar-preview.c
--- a/src/sugar/sugar-preview.h
+++ b/src/sugar/sugar-preview.h
--- a/src/sugar/util.py
+++ b/src/sugar/util.py
--- a/src/sugar/wm.py
+++ b/src/sugar/wm.py