[nautilus: 44/47] Move other files away from src/file-manager

[Cosimo Cecchi <cosimoc src gnome org>]

commit d5c9bae1381cb1f322d5ee3e0efbb27e06154574
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 11 16:35:06 2011 +0100

    Move other files away from src/file-manager

 configure.in                                       |    1 -
 src/Makefile.am                                    |   14 ++++++-
 src/file-manager/Makefile.am                       |   37 --------------------
 .../nautilus-desktop-icon-view-ui.xml              |    0
 .../nautilus-directory-view-ui.xml                 |    0
 .../fm-empty-view.c => nautilus-empty-view.c}      |    0
 .../fm-empty-view.h => nautilus-empty-view.h}      |    0
 src/{file-manager => }/nautilus-icon-view-ui.xml   |    0
 src/{file-manager => }/nautilus-list-view-ui.xml   |    0
 9 files changed, 12 insertions(+), 40 deletions(-)
---
diff --git a/configure.in b/configure.in
index 24a06e7..2a51405 100644
--- a/configure.in
+++ b/configure.in
@@ -360,7 +360,6 @@ libnautilus-extension/libnautilus-extension.pc
 libnautilus-extension/libnautilus-extension-uninstalled.pc
 po/Makefile.in
 src/Makefile
-src/file-manager/Makefile
 nautilus-sendto-extension/Makefile
 test/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index cbefba5..4b73364 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Makefile.shared
 
-SUBDIRS=file-manager
-
 bin_PROGRAMS=					\
 	nautilus				\
 	nautilus-autorun-software		\
@@ -169,6 +167,14 @@ nautilus_SOURCES = \
 	nautilus-zoom-control.h			\
 	$(NULL)
 
+EMPTY_VIEW_SOURCES = \
+	nautilus-empty-view.c \
+	nautilus-empty-view.h
+
+if ENABLE_EMPTY_VIEW
+nautilus_SOURCES += $(EMPTY_VIEW_SOURCES)
+endif
+
 nodist_nautilus_SOURCES = \
 	$(BUILT_SOURCES) \
 	$(NULL)
@@ -220,6 +226,10 @@ ui_DATA = 					\
 	nautilus-spatial-window-ui.xml          \
 	nautilus-file-management-properties.ui	\
 	nautilus-bookmarks-window.ui		\
+	nautilus-desktop-icon-view-ui.xml	\
+	nautilus-directory-view-ui.xml		\
+	nautilus-icon-view-ui.xml		\
+	nautilus-list-view-ui.xml		\
 	$(NULL)
 
 CLEANFILES = \
diff --git a/src/file-manager/nautilus-desktop-icon-view-ui.xml b/src/nautilus-desktop-icon-view-ui.xml
similarity index 100%
rename from src/file-manager/nautilus-desktop-icon-view-ui.xml
rename to src/nautilus-desktop-icon-view-ui.xml
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
similarity index 100%
rename from src/file-manager/nautilus-directory-view-ui.xml
rename to src/nautilus-directory-view-ui.xml
diff --git a/src/file-manager/fm-empty-view.c b/src/nautilus-empty-view.c
similarity index 100%
rename from src/file-manager/fm-empty-view.c
rename to src/nautilus-empty-view.c
diff --git a/src/file-manager/fm-empty-view.h b/src/nautilus-empty-view.h
similarity index 100%
rename from src/file-manager/fm-empty-view.h
rename to src/nautilus-empty-view.h
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/nautilus-icon-view-ui.xml
similarity index 100%
rename from src/file-manager/nautilus-icon-view-ui.xml
rename to src/nautilus-icon-view-ui.xml
diff --git a/src/file-manager/nautilus-list-view-ui.xml b/src/nautilus-list-view-ui.xml
similarity index 100%
rename from src/file-manager/nautilus-list-view-ui.xml
rename to src/nautilus-list-view-ui.xml