[nautilus-sendto] cleanup directory tree

[Daniel G. Siegel <dgsiegel src gnome org>]

commit abd3f289890b017684874382c4caa4e8e04e36d2
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Tue Aug 17 12:36:05 2010 +0200

    cleanup directory tree
    
    moved data files, such as the ui files, the pkgconfig file
    and the gconf/gsettings schema files to data. src should now
    only contain source code

 .gitignore                                         |   16 +++++++++++-----
 Makefile.am                                        |    2 +-
 configure.in                                       |    3 ++-
 data/Makefile.am                                   |   15 +++++++++++++++
 {src => data}/nautilus-sendto-convert              |    0
 {src => data}/nautilus-sendto.pc.in                |    0
 {src => data}/nautilus-sendto.ui                   |    0
 .../org.gnome.Nautilus.Sendto.gschema.xml.in       |    0
 {src/plugins => data}/pack-entry.ui                |    0
 src/Makefile.am                                    |   15 ---------------
 src/nautilus-sendto-command.c                      |    2 +-
 src/plugins/Makefile.am                            |    1 -
 src/plugins/nst-common.c                           |    2 +-
 13 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9dbdbb9..da76201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
-.deps
-.libs
 *.gmo
-*.lo
 *.la
+*.lo
+*.nst-plugin
 *.o
-*~
 *.swp
+*~
+.deps
+.libs
+INSTALL
 Makefile
 Makefile.in
 Makefile.in.in
@@ -18,6 +20,9 @@ config.log
 config.status
 config.sub
 configure
+data/nautilus-sendto.pc
+data/org.gnome.Nautilus.Sendto.gschema.valid
+data/org.gnome.Nautilus.Sendto.gschema.xml
 depcomp
 docs/nautilus-sendto/version.xml
 gtk-doc.make
@@ -34,9 +39,10 @@ po/.intltool-merge-cache
 po/POTFILES
 po/stamp-it
 src/nautilus-sendto
-src/nautilus-sendto.pc
 src/nst-enum-types.c
 src/nst-enum-types.h
+src/plugins/NautilusSendto-1.0.gir
+src/plugins/NautilusSendto-1.0.typelib
 src/plugins/bluetooth/bluetooth-marshal.c
 src/plugins/bluetooth/bluetooth-marshal.h
 src/plugins/evolution/econtactentry-marshal.c
diff --git a/Makefile.am b/Makefile.am
index 4190fcb..db1cd24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src docs po
+SUBDIRS = data src docs po
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
 
diff --git a/configure.in b/configure.in
index 9b5cc15..58b793b 100644
--- a/configure.in
+++ b/configure.in
@@ -233,9 +233,10 @@ AM_GLIB_GNU_GETTEXT
 
 AC_OUTPUT([
 Makefile
+data/Makefile
+data/nautilus-sendto.pc
 src/Makefile
 src/extension/Makefile
-src/nautilus-sendto.pc
 src/plugins/Makefile
 src/plugins/evolution/Makefile
 src/plugins/gajim/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..61ba46d
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = nautilus-sendto.pc
+
+ui_DATA = nautilus-sendto.ui pack-entry.ui
+uidir = $(datadir)/nautilus-sendto/ui
+
+convertdir=$(datadir)/GConf/gsettings
+convert_DATA = nautilus-sendto-convert
+
+gsettingsschema_in_files = org.gnome.Nautilus.Sendto.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+EXTRA_DIST = $(ui_DATA) nautilus-sendto.pc.in $(convert_DATA) $(gsettingsschema_in_files)
diff --git a/src/nautilus-sendto-convert b/data/nautilus-sendto-convert
similarity index 100%
rename from src/nautilus-sendto-convert
rename to data/nautilus-sendto-convert
diff --git a/src/nautilus-sendto.pc.in b/data/nautilus-sendto.pc.in
similarity index 100%
rename from src/nautilus-sendto.pc.in
rename to data/nautilus-sendto.pc.in
diff --git a/src/nautilus-sendto.ui b/data/nautilus-sendto.ui
similarity index 100%
rename from src/nautilus-sendto.ui
rename to data/nautilus-sendto.ui
diff --git a/src/org.gnome.Nautilus.Sendto.gschema.xml.in b/data/org.gnome.Nautilus.Sendto.gschema.xml.in
similarity index 100%
rename from src/org.gnome.Nautilus.Sendto.gschema.xml.in
rename to data/org.gnome.Nautilus.Sendto.gschema.xml.in
diff --git a/src/plugins/pack-entry.ui b/data/pack-entry.ui
similarity index 100%
rename from src/plugins/pack-entry.ui
rename to data/pack-entry.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index d96a3f0..8977b34 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,12 +13,6 @@ INCLUDES =					\
 	$(DISABLE_DEPRECATED)			\
 	$(WARN_CFLAGS)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = nautilus-sendto.pc
-
-ui_DATA = nautilus-sendto.ui
-uidir = $(datadir)/nautilus-sendto/ui
-
 noinst_LTLIBRARIES = libnstplugin.la
 libnstplugin_la_SOURCES =			\
 	nst-enum-types.c			\
@@ -55,13 +49,4 @@ nst-enum-types.c: $(nst_headers_to_scan_for_enums) Makefile nst-enum-types.h
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
 		$(nst_headers_to_scan_for_enums)) > $@
 
-convertdir=$(datadir)/GConf/gsettings
-convert_DATA = nautilus-sendto-convert
-
-gsettingsschema_in_files = org.gnome.Nautilus.Sendto.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
-EXTRA_DIST = $(ui_DATA) nautilus-sendto.pc.in $(convert_DATA) $(gsettingsschema_in_files)
 CLEANFILES = $(nst_built_headers) $(nst_built_cfiles)
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index b7d8a48..671ceb9 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -275,7 +275,7 @@ nautilus_sendto_create_ui (void)
 
 	app = gtk_builder_new ();
 	if (run_from_build_dir) {
-		ui_file = "nautilus-sendto.ui";
+		ui_file = "../data/nautilus-sendto.ui";
 		g_setenv ("NST_RUN_FROM_BUILDDIR", "1", TRUE);
 	} else {
 		ui_file = UIDIR "/" "nautilus-sendto.ui";
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 5d07dfd..6d445b5 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -19,7 +19,6 @@ libnautilussendto_1_0_la_SOURCES = nautilus-sendto-plugin.h nautilus-sendto-plug
 libnautilussendto_1_0_la_LIBADD = $(NAUTILUS_SENDTO_LIBS)
 libnautilussendto_1_0_la_CFLAGS = $(NAUTILUS_SENDTO_CFLAGS)
 
-ui_DATA = pack-entry.ui
 uidir = $(datadir)/nautilus-sendto/ui
 
 if HAVE_INTROSPECTION
diff --git a/src/plugins/nst-common.c b/src/plugins/nst-common.c
index 5590e5c..03afb9d 100644
--- a/src/plugins/nst-common.c
+++ b/src/plugins/nst-common.c
@@ -257,7 +257,7 @@ nst_pack_widget_init (NstPackWidget *self)
 
 	builder = gtk_builder_new ();
 	if (g_getenv ("NST_RUN_FROM_BUILDDIR") != NULL)
-		ui_file = "plugins/pack-entry.ui";
+		ui_file = "../data/pack-entry.ui";
 	else
 		ui_file = UIDIR "/" "pack-entry.ui";