[nautilus/wip/csoriano/desktop-split] desktop: move to a different folder

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit 9a5cdc3f73e9400af818a82074704a2aeed738a6
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Apr 7 09:14:37 2016 +0200

    desktop: move to a different folder
    
    For a better structured hierarchy.

 Makefile.am                                        |    1 +
 libnautilus-private/Makefile.am                    |   12 ----
 nautilus-desktop/Makefile.am                       |   64 ++++++++++++++++++++
 {src => nautilus-desktop}/main-desktop.c           |    0
 .../nautilus-desktop-application.c                 |    0
 .../nautilus-desktop-application.h                 |    0
 .../nautilus-desktop-canvas-view-container.c       |    0
 .../nautilus-desktop-canvas-view-container.h       |    0
 .../nautilus-desktop-canvas-view.c                 |    0
 .../nautilus-desktop-canvas-view.h                 |    0
 .../nautilus-desktop-directory-file.c              |    0
 .../nautilus-desktop-directory-file.h              |    0
 .../nautilus-desktop-directory.c                   |    0
 .../nautilus-desktop-directory.h                   |    0
 .../nautilus-desktop-link-monitor.c                |    0
 .../nautilus-desktop-link-monitor.h                |    0
 .../nautilus-desktop-link.c                        |    0
 .../nautilus-desktop-link.h                        |    0
 .../nautilus-desktop-metadata.c                    |    0
 .../nautilus-desktop-metadata.h                    |    0
 .../nautilus-desktop-window-slot.c                 |    0
 .../nautilus-desktop-window-slot.h                 |    0
 .../nautilus-desktop-window.c                      |    0
 .../nautilus-desktop-window.h                      |    0
 src/Makefile.am                                    |   20 ------
 25 files changed, 65 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ee62eca..4ac2709 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ DIRS =                                \
        po                      \
        data                    \
        docs                    \
+       nautilus-desktop        \
        $(NULL)
 
 DIST_SUBDIRS = $(DIRS) nautilus-sendto-extension
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 8c37d4d..7e0718f 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -80,18 +80,6 @@ libnautilus_private_la_SOURCES = \
        nautilus-debug.h \
        nautilus-default-file-icon.c \
        nautilus-default-file-icon.h \
-       nautilus-desktop-directory-file.c \
-       nautilus-desktop-directory-file.h \
-       nautilus-desktop-directory.c \
-       nautilus-desktop-directory.h \
-       nautilus-desktop-icon-file.c \
-       nautilus-desktop-icon-file.h \
-       nautilus-desktop-link-monitor.c \
-       nautilus-desktop-link-monitor.h \
-       nautilus-desktop-link.c \
-       nautilus-desktop-link.h \
-       nautilus-desktop-metadata.c \
-       nautilus-desktop-metadata.h \
        nautilus-directory-async.c \
        nautilus-directory-notify.h \
        nautilus-directory-private.h \
diff --git a/nautilus-desktop/Makefile.am b/nautilus-desktop/Makefile.am
new file mode 100644
index 0000000..9105d03
--- /dev/null
+++ b/nautilus-desktop/Makefile.am
@@ -0,0 +1,64 @@
+include $(top_srcdir)/Makefile.shared
+
+bin_PROGRAMS=                                  \
+       nautilus-desktop                        \
+       $(NULL)
+
+AM_CPPFLAGS =                                                  \
+       -I$(top_srcdir)                                         \
+       -I$(top_srcdir)/libnautilus-private                     \
+       -I$(top_builddir)/libnautilus-private                   \
+       -I$(top_srcdir)/libgd                                   \
+       $(BASE_CFLAGS)                                          \
+       $(COMMON_CFLAGS)                                        \
+       $(NAUTILUS_CFLAGS)                                      \
+       $(WARNING_CFLAGS)                                       \
+       $(EXIF_CFLAGS)                                          \
+       $(EXEMPI_CFLAGS)                                        \
+       -DDATADIR=\""$(datadir)"\"                              \
+       -DLIBDIR=\""$(libdir)"\"                                \
+       -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\"            \
+       -DPREFIX=\""$(prefix)"\"                                \
+       -DVERSION="\"$(VERSION)\""                              \
+       $(DISABLE_DEPRECATED)                                   \
+       $(NULL)
+
+LDADD =\
+       $(top_builddir)/libnautilus-private/libnautilus-private.la  \
+       $(top_builddir)/libgd/libgd.la \
+       $(BASE_LIBS) \
+       $(COMMON_LIBS) \
+       $(NAUTILUS_LIBS) \
+       $(CORE_LIBS) \
+       $(EXIF_LIBS) \
+       $(EXEMPI_LIBS) \
+       $(POPT_LIBS) \
+       $(NULL)
+
+nautilus_desktop_SOURCES=                              \
+       main-desktop.c                                  \
+       nautilus-desktop-application.c                  \
+       nautilus-desktop-application.h                  \
+       nautilus-desktop-canvas-view.c          \
+       nautilus-desktop-canvas-view.h          \
+       nautilus-desktop-canvas-view-container.c        \
+       nautilus-desktop-canvas-view-container.h        \
+       nautilus-desktop-directory.c \
+       nautilus-desktop-directory.h \
+       nautilus-desktop-directory-file.c \
+       nautilus-desktop-directory-file.h \
+       nautilus-desktop-icon-file.c \
+       nautilus-desktop-icon-file.h \
+       nautilus-desktop-link.c \
+       nautilus-desktop-link.h \
+       nautilus-desktop-link-monitor.c \
+       nautilus-desktop-link-monitor.h \
+       nautilus-desktop-metadata.c \
+       nautilus-desktop-metadata.h \
+       nautilus-desktop-window.c               \
+       nautilus-desktop-window.h               \
+       nautilus-desktop-window-slot.c          \
+       nautilus-desktop-window-slot.h          \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/main-desktop.c b/nautilus-desktop/main-desktop.c
similarity index 100%
rename from src/main-desktop.c
rename to nautilus-desktop/main-desktop.c
diff --git a/src/nautilus-desktop-application.c b/nautilus-desktop/nautilus-desktop-application.c
similarity index 100%
rename from src/nautilus-desktop-application.c
rename to nautilus-desktop/nautilus-desktop-application.c
diff --git a/src/nautilus-desktop-application.h b/nautilus-desktop/nautilus-desktop-application.h
similarity index 100%
rename from src/nautilus-desktop-application.h
rename to nautilus-desktop/nautilus-desktop-application.h
diff --git a/src/nautilus-desktop-canvas-view-container.c 
b/nautilus-desktop/nautilus-desktop-canvas-view-container.c
similarity index 100%
rename from src/nautilus-desktop-canvas-view-container.c
rename to nautilus-desktop/nautilus-desktop-canvas-view-container.c
diff --git a/src/nautilus-desktop-canvas-view-container.h 
b/nautilus-desktop/nautilus-desktop-canvas-view-container.h
similarity index 100%
rename from src/nautilus-desktop-canvas-view-container.h
rename to nautilus-desktop/nautilus-desktop-canvas-view-container.h
diff --git a/src/nautilus-desktop-canvas-view.c b/nautilus-desktop/nautilus-desktop-canvas-view.c
similarity index 100%
rename from src/nautilus-desktop-canvas-view.c
rename to nautilus-desktop/nautilus-desktop-canvas-view.c
diff --git a/src/nautilus-desktop-canvas-view.h b/nautilus-desktop/nautilus-desktop-canvas-view.h
similarity index 100%
rename from src/nautilus-desktop-canvas-view.h
rename to nautilus-desktop/nautilus-desktop-canvas-view.h
diff --git a/libnautilus-private/nautilus-desktop-directory-file.c 
b/nautilus-desktop/nautilus-desktop-directory-file.c
similarity index 100%
rename from libnautilus-private/nautilus-desktop-directory-file.c
rename to nautilus-desktop/nautilus-desktop-directory-file.c
diff --git a/libnautilus-private/nautilus-desktop-directory-file.h 
b/nautilus-desktop/nautilus-desktop-directory-file.h
similarity index 100%
rename from libnautilus-private/nautilus-desktop-directory-file.h
rename to nautilus-desktop/nautilus-desktop-directory-file.h
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/nautilus-desktop/nautilus-desktop-directory.c
similarity index 100%
rename from libnautilus-private/nautilus-desktop-directory.c
rename to nautilus-desktop/nautilus-desktop-directory.c
diff --git a/libnautilus-private/nautilus-desktop-directory.h b/nautilus-desktop/nautilus-desktop-directory.h
similarity index 100%
rename from libnautilus-private/nautilus-desktop-directory.h
rename to nautilus-desktop/nautilus-desktop-directory.h
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c 
b/nautilus-desktop/nautilus-desktop-link-monitor.c
similarity index 100%
rename from libnautilus-private/nautilus-desktop-link-monitor.c
rename to nautilus-desktop/nautilus-desktop-link-monitor.c
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.h 
b/nautilus-desktop/nautilus-desktop-link-monitor.h
similarity index 100%
rename from libnautilus-private/nautilus-desktop-link-monitor.h
rename to nautilus-desktop/nautilus-desktop-link-monitor.h
diff --git a/libnautilus-private/nautilus-desktop-link.c b/nautilus-desktop/nautilus-desktop-link.c
similarity index 100%
rename from libnautilus-private/nautilus-desktop-link.c
rename to nautilus-desktop/nautilus-desktop-link.c
diff --git a/libnautilus-private/nautilus-desktop-link.h b/nautilus-desktop/nautilus-desktop-link.h
similarity index 100%
rename from libnautilus-private/nautilus-desktop-link.h
rename to nautilus-desktop/nautilus-desktop-link.h
diff --git a/libnautilus-private/nautilus-desktop-metadata.c b/nautilus-desktop/nautilus-desktop-metadata.c
similarity index 100%
rename from libnautilus-private/nautilus-desktop-metadata.c
rename to nautilus-desktop/nautilus-desktop-metadata.c
diff --git a/libnautilus-private/nautilus-desktop-metadata.h b/nautilus-desktop/nautilus-desktop-metadata.h
similarity index 100%
rename from libnautilus-private/nautilus-desktop-metadata.h
rename to nautilus-desktop/nautilus-desktop-metadata.h
diff --git a/src/nautilus-desktop-window-slot.c b/nautilus-desktop/nautilus-desktop-window-slot.c
similarity index 100%
rename from src/nautilus-desktop-window-slot.c
rename to nautilus-desktop/nautilus-desktop-window-slot.c
diff --git a/src/nautilus-desktop-window-slot.h b/nautilus-desktop/nautilus-desktop-window-slot.h
similarity index 100%
rename from src/nautilus-desktop-window-slot.h
rename to nautilus-desktop/nautilus-desktop-window-slot.h
diff --git a/src/nautilus-desktop-window.c b/nautilus-desktop/nautilus-desktop-window.c
similarity index 100%
rename from src/nautilus-desktop-window.c
rename to nautilus-desktop/nautilus-desktop-window.c
diff --git a/src/nautilus-desktop-window.h b/nautilus-desktop/nautilus-desktop-window.h
similarity index 100%
rename from src/nautilus-desktop-window.h
rename to nautilus-desktop/nautilus-desktop-window.h
diff --git a/src/Makefile.am b/src/Makefile.am
index e10e7ed..0dd7dd0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/Makefile.shared
 
 bin_PROGRAMS=                                  \
        nautilus                                \
-       nautilus-desktop                        \
        nautilus-autorun-software               \
        $(NULL)
 
@@ -150,16 +149,8 @@ nautilus_no_main_sources = \
        nautilus-canvas-view-container.h        \
        nautilus-dbus-manager.c                 \
        nautilus-dbus-manager.h                 \
-       nautilus-desktop-canvas-view.c          \
-       nautilus-desktop-canvas-view.h          \
-       nautilus-desktop-canvas-view-container.c        \
-       nautilus-desktop-canvas-view-container.h        \
        nautilus-desktop-item-properties.c      \
        nautilus-desktop-item-properties.h      \
-       nautilus-desktop-window.c               \
-       nautilus-desktop-window.h               \
-       nautilus-desktop-window-slot.c          \
-       nautilus-desktop-window-slot.h          \
        nautilus-error-reporting.c              \
        nautilus-error-reporting.h              \
        nautilus-preferences-window.c   \
@@ -232,21 +223,10 @@ nautilus_SOURCES = \
        nautilus-main.c                         \
        $(NULL)
 
-nautilus_desktop_SOURCES=                              \
-       $(nautilus_no_main_sources)                     \
-       main-desktop.c                                  \
-       nautilus-desktop-application.c                  \
-       nautilus-desktop-application.h                  \
-       $(NULL)
-
 nodist_nautilus_SOURCES = \
        $(nautilus_built_sources) \
        $(NULL)
 
-nodist_nautilus_desktop_SOURCES = \
-       $(nautilus_built_sources) \
-       $(NULL)
-
 EMPTY_VIEW_SOURCES = \
        nautilus-empty-view.c                   \
        nautilus-empty-view.h