summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2016-04-15 10:35:34 +0200
committerCarlos Soriano <csoriano@gnome.org>2016-04-15 16:04:34 +0200
commitc9dcccae611e40f48024bdfeccbb081fa10b7b15 (patch)
treee1e51188b0d3973b341a111a40e5802ec70adfae
parent035cd2db2d10c0194b74eb87ce337a775f7e49bb (diff)
downloadnautilus-c9dcccae611e40f48024bdfeccbb081fa10b7b15.tar.gz
desktop: move to a different folder
For a better structured hierarchy.
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac1
-rw-r--r--libnautilus-private/Makefile.am12
-rw-r--r--nautilus-desktop/Makefile.am67
-rw-r--r--nautilus-desktop/main-desktop.c (renamed from src/main-desktop.c)0
-rw-r--r--nautilus-desktop/nautilus-desktop-application.c (renamed from src/nautilus-desktop-application.c)0
-rw-r--r--nautilus-desktop/nautilus-desktop-application.h (renamed from src/nautilus-desktop-application.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-canvas-view-container.c (renamed from src/nautilus-desktop-canvas-view-container.c)0
-rw-r--r--nautilus-desktop/nautilus-desktop-canvas-view-container.h (renamed from src/nautilus-desktop-canvas-view-container.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-canvas-view.c (renamed from src/nautilus-desktop-canvas-view.c)7
-rw-r--r--nautilus-desktop/nautilus-desktop-canvas-view.h (renamed from src/nautilus-desktop-canvas-view.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-directory-file.c (renamed from libnautilus-private/nautilus-desktop-directory-file.c)17
-rw-r--r--nautilus-desktop/nautilus-desktop-directory-file.h (renamed from libnautilus-private/nautilus-desktop-directory-file.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-directory.c (renamed from libnautilus-private/nautilus-desktop-directory.c)10
-rw-r--r--nautilus-desktop/nautilus-desktop-directory.h (renamed from libnautilus-private/nautilus-desktop-directory.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-icon-file.c (renamed from libnautilus-private/nautilus-desktop-icon-file.c)59
-rw-r--r--nautilus-desktop/nautilus-desktop-icon-file.h (renamed from libnautilus-private/nautilus-desktop-icon-file.h)13
-rw-r--r--nautilus-desktop/nautilus-desktop-link-monitor.c (renamed from libnautilus-private/nautilus-desktop-link-monitor.c)6
-rw-r--r--nautilus-desktop/nautilus-desktop-link-monitor.h (renamed from libnautilus-private/nautilus-desktop-link-monitor.h)2
-rw-r--r--nautilus-desktop/nautilus-desktop-link.c (renamed from libnautilus-private/nautilus-desktop-link.c)6
-rw-r--r--nautilus-desktop/nautilus-desktop-link.h (renamed from libnautilus-private/nautilus-desktop-link.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-metadata.c (renamed from libnautilus-private/nautilus-desktop-metadata.c)4
-rw-r--r--nautilus-desktop/nautilus-desktop-metadata.h (renamed from libnautilus-private/nautilus-desktop-metadata.h)0
-rw-r--r--nautilus-desktop/nautilus-desktop-window-slot.c (renamed from src/nautilus-desktop-window-slot.c)0
-rw-r--r--nautilus-desktop/nautilus-desktop-window-slot.h (renamed from src/nautilus-desktop-window-slot.h)4
-rw-r--r--nautilus-desktop/nautilus-desktop-window.c (renamed from src/nautilus-desktop-window.c)7
-rw-r--r--nautilus-desktop/nautilus-desktop-window.h (renamed from src/nautilus-desktop-window.h)2
-rw-r--r--src/Makefile.am36
28 files changed, 154 insertions, 100 deletions
diff --git a/Makefile.am b/Makefile.am
index ee62eca68..4ac2709ff 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/configure.ac b/configure.ac
index ae2ffecdf..955a6bdba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,7 @@ libnautilus-extension/libnautilus-extension-uninstalled.pc
libgd/Makefile
po/Makefile.in
src/Makefile
+nautilus-desktop/Makefile
nautilus-sendto-extension/Makefile
test/Makefile
])
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 8c37d4db7..7e0718fb7 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 000000000..0471106c8
--- /dev/null
+++ b/nautilus-desktop/Makefile.am
@@ -0,0 +1,67 @@
+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 \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ $(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 \
+ $(top_builddir)/src/libnautilus.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
index 7c488a8b4..7c488a8b4 100644
--- a/src/main-desktop.c
+++ b/nautilus-desktop/main-desktop.c
diff --git a/src/nautilus-desktop-application.c b/nautilus-desktop/nautilus-desktop-application.c
index 31ff6e603..31ff6e603 100644
--- a/src/nautilus-desktop-application.c
+++ b/nautilus-desktop/nautilus-desktop-application.c
diff --git a/src/nautilus-desktop-application.h b/nautilus-desktop/nautilus-desktop-application.h
index 4f4c62c47..4f4c62c47 100644
--- a/src/nautilus-desktop-application.h
+++ b/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
index 23db902d2..23db902d2 100644
--- a/src/nautilus-desktop-canvas-view-container.c
+++ b/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
index 018062b7d..018062b7d 100644
--- a/src/nautilus-desktop-canvas-view-container.h
+++ b/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
index 5c79312c4..04731d96e 100644
--- a/src/nautilus-desktop-canvas-view.c
+++ b/nautilus-desktop/nautilus-desktop-canvas-view.c
@@ -27,9 +27,9 @@
#include "nautilus-desktop-canvas-view.h"
-#include "nautilus-canvas-view-container.h"
#include "nautilus-desktop-canvas-view-container.h"
-#include "nautilus-files-view.h"
+#include "nautilus-desktop-icon-file.h"
+#include "nautilus-desktop-directory.h"
#include <X11/Xatom.h>
#include <gtk/gtk.h>
@@ -39,8 +39,6 @@
#include <fcntl.h>
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-desktop-icon-file.h>
-#include <libnautilus-private/nautilus-desktop-directory.h>
#include <libnautilus-private/nautilus-directory-notify.h>
#include <libnautilus-private/nautilus-file-changes-queue.h>
#include <libnautilus-private/nautilus-file-operations.h>
@@ -52,6 +50,7 @@
#include <libnautilus-private/nautilus-monitor.h>
#include <libnautilus-private/nautilus-program-choosing.h>
#include <libnautilus-private/nautilus-trash-monitor.h>
+#include <src/nautilus-files-view.h>
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
diff --git a/src/nautilus-desktop-canvas-view.h b/nautilus-desktop/nautilus-desktop-canvas-view.h
index e40d80ff4..e40d80ff4 100644
--- a/src/nautilus-desktop-canvas-view.h
+++ b/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
index 2a43bdf98..ba3cd136c 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/nautilus-desktop/nautilus-desktop-directory-file.c
@@ -22,16 +22,17 @@
#include <config.h>
#include "nautilus-desktop-directory-file.h"
-
#include "nautilus-desktop-metadata.h"
-#include "nautilus-directory-notify.h"
-#include "nautilus-directory-private.h"
-#include "nautilus-file-attributes.h"
-#include "nautilus-file-private.h"
-#include "nautilus-file-utilities.h"
-#include <eel/eel-glib-extensions.h>
#include "nautilus-desktop-directory.h"
-#include "nautilus-metadata.h"
+
+#include <libnautilus-private/nautilus-directory-notify.h>
+#include <libnautilus-private/nautilus-directory-private.h>
+#include <libnautilus-private/nautilus-file-attributes.h>
+#include <libnautilus-private/nautilus-file-private.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
+#include <libnautilus-private/nautilus-metadata.h>
+
+#include <eel/eel-glib-extensions.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <string.h>
diff --git a/libnautilus-private/nautilus-desktop-directory-file.h b/nautilus-desktop/nautilus-desktop-directory-file.h
index 2a5097980..2a5097980 100644
--- a/libnautilus-private/nautilus-desktop-directory-file.h
+++ b/nautilus-desktop/nautilus-desktop-directory-file.h
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/nautilus-desktop/nautilus-desktop-directory.c
index 9f97baaa9..6a43ec5e8 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/nautilus-desktop/nautilus-desktop-directory.c
@@ -25,11 +25,11 @@
#include "nautilus-desktop-directory.h"
#include "nautilus-desktop-directory-file.h"
-#include "nautilus-directory-private.h"
-#include "nautilus-file.h"
-#include "nautilus-file-private.h"
-#include "nautilus-file-utilities.h"
-#include "nautilus-global-preferences.h"
+#include <libnautilus-private/nautilus-directory-private.h>
+#include <libnautilus-private/nautilus-file.h>
+#include <libnautilus-private/nautilus-file-private.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
#include <gtk/gtk.h>
struct NautilusDesktopDirectoryDetails {
diff --git a/libnautilus-private/nautilus-desktop-directory.h b/nautilus-desktop/nautilus-desktop-directory.h
index 9e9dc4949..9e9dc4949 100644
--- a/libnautilus-private/nautilus-desktop-directory.h
+++ b/nautilus-desktop/nautilus-desktop-directory.h
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/nautilus-desktop/nautilus-desktop-icon-file.c
index 3519d0476..073b81318 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
+++ b/nautilus-desktop/nautilus-desktop-icon-file.c
@@ -1,40 +1,41 @@
/*
nautilus-desktop-icon-file.c: Subclass of NautilusFile to help implement the
virtual desktop icons.
-
+
Copyright (C) 2003 Red Hat, Inc.
-
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-
+
You should have received a copy of the GNU General Public
License along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
Author: Alexander Larsson <alexl@redhat.com>
*/
#include <config.h>
#include "nautilus-desktop-icon-file.h"
-
#include "nautilus-desktop-metadata.h"
#include "nautilus-desktop-directory-file.h"
-#include "nautilus-directory-notify.h"
-#include "nautilus-directory-private.h"
-#include "nautilus-file-attributes.h"
-#include "nautilus-file-private.h"
-#include "nautilus-file-utilities.h"
-#include "nautilus-file-operations.h"
-#include "nautilus-link.h"
-#include "nautilus-file-undo-manager.h"
-#include <eel/eel-glib-extensions.h>
#include "nautilus-desktop-directory.h"
+
+#include <libnautilus-private/nautilus-directory-notify.h>
+#include <libnautilus-private/nautilus-directory-private.h>
+#include <libnautilus-private/nautilus-file-attributes.h>
+#include <libnautilus-private/nautilus-file-private.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
+#include <libnautilus-private/nautilus-file-operations.h>
+#include <libnautilus-private/nautilus-link.h>
+#include <libnautilus-private/nautilus-file-undo-manager.h>
+
+#include <eel/eel-glib-extensions.h>
#include <glib/gi18n.h>
#include <string.h>
#include <gio/gio.h>
@@ -95,7 +96,7 @@ desktop_icon_file_check_if_ready (NautilusFile *file,
}
static gboolean
-desktop_icon_file_get_item_count (NautilusFile *file,
+desktop_icon_file_get_item_count (NautilusFile *file,
guint *count,
gboolean *count_unreadable)
{
@@ -165,9 +166,9 @@ update_info_from_link (NautilusDesktopIconFile *icon_file)
NautilusDesktopLink *link;
char *display_name;
GMount *mount;
-
+
file = NAUTILUS_FILE (icon_file);
-
+
link = icon_file->details->link;
if (link == NULL) {
@@ -194,7 +195,7 @@ update_info_from_link (NautilusDesktopIconFile *icon_file)
file->details->can_unmount = g_mount_can_unmount (mount);
file->details->can_eject = g_mount_can_eject (mount);
}
-
+
file->details->file_info_is_up_to_date = TRUE;
display_name = nautilus_desktop_link_get_display_name (link);
@@ -220,7 +221,7 @@ void
nautilus_desktop_icon_file_update (NautilusDesktopIconFile *icon_file)
{
NautilusFile *file;
-
+
update_info_from_link (icon_file);
file = NAUTILUS_FILE (icon_file);
nautilus_file_changed (file);
@@ -235,22 +236,22 @@ nautilus_desktop_icon_file_remove (NautilusDesktopIconFile *icon_file)
icon_file->details->link = NULL;
file = NAUTILUS_FILE (icon_file);
-
+
/* ref here because we might be removing the last ref when we
* mark the file gone below, but we need to keep a ref at
- * least long enough to send the change notification.
+ * least long enough to send the change notification.
*/
nautilus_file_ref (file);
-
+
file->details->is_gone = TRUE;
-
+
list.data = file;
list.next = NULL;
list.prev = NULL;
-
+
nautilus_directory_remove_file (file->details->directory, file);
nautilus_directory_emit_change_signals (file->details->directory, &list);
-
+
nautilus_file_unref (file);
}
@@ -314,7 +315,7 @@ nautilus_desktop_icon_file_unmount (NautilusFile *file,
{
NautilusDesktopIconFile *desktop_file;
GMount *mount;
-
+
desktop_file = NAUTILUS_DESKTOP_ICON_FILE (file);
if (desktop_file) {
mount = nautilus_desktop_link_get_mount (desktop_file->details->link);
@@ -322,7 +323,7 @@ nautilus_desktop_icon_file_unmount (NautilusFile *file,
nautilus_file_operations_unmount_mount (NULL, mount, FALSE, TRUE);
}
}
-
+
}
static void
@@ -334,7 +335,7 @@ nautilus_desktop_icon_file_eject (NautilusFile *file,
{
NautilusDesktopIconFile *desktop_file;
GMount *mount;
-
+
desktop_file = NAUTILUS_DESKTOP_ICON_FILE (file);
if (desktop_file) {
mount = nautilus_desktop_link_get_mount (desktop_file->details->link);
diff --git a/libnautilus-private/nautilus-desktop-icon-file.h b/nautilus-desktop/nautilus-desktop-icon-file.h
index 8fe802796..c65236531 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.h
+++ b/nautilus-desktop/nautilus-desktop-icon-file.h
@@ -1,30 +1,31 @@
/*
nautilus-desktop-file.h: Subclass of NautilusFile to implement the
the case of a desktop icon file
-
+
Copyright (C) 2003 Red Hat, Inc.
-
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-
+
You should have received a copy of the GNU General Public
License along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
Author: Alexander Larsson <alexl@redhat.com>
*/
#ifndef NAUTILUS_DESKTOP_ICON_FILE_H
#define NAUTILUS_DESKTOP_ICON_FILE_H
+#include "nautilus-desktop-link.h"
+
#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-desktop-link.h>
#define NAUTILUS_TYPE_DESKTOP_ICON_FILE nautilus_desktop_icon_file_get_type()
#define NAUTILUS_DESKTOP_ICON_FILE(obj) \
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/nautilus-desktop/nautilus-desktop-link-monitor.c
index 21b0cd69f..54ce6daf9 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/nautilus-desktop/nautilus-desktop-link-monitor.c
@@ -23,9 +23,7 @@
#include "nautilus-desktop-link-monitor.h"
#include "nautilus-desktop-link.h"
#include "nautilus-desktop-icon-file.h"
-#include "nautilus-directory.h"
#include "nautilus-desktop-directory.h"
-#include "nautilus-global-preferences.h"
#include <eel/eel-debug.h>
#include <eel/eel-vfs-extensions.h>
@@ -33,7 +31,11 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
+
#include <libnautilus-private/nautilus-trash-monitor.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-directory.h>
+
#include <string.h>
struct NautilusDesktopLinkMonitorDetails {
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.h b/nautilus-desktop/nautilus-desktop-link-monitor.h
index dc47aea0c..304f23910 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.h
+++ b/nautilus-desktop/nautilus-desktop-link-monitor.h
@@ -23,7 +23,7 @@
#define NAUTILUS_DESKTOP_LINK_MONITOR_H
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-desktop-link.h>
+#include "nautilus-desktop-link.h"
#define NAUTILUS_TYPE_DESKTOP_LINK_MONITOR nautilus_desktop_link_monitor_get_type()
#define NAUTILUS_DESKTOP_LINK_MONITOR(obj) \
diff --git a/libnautilus-private/nautilus-desktop-link.c b/nautilus-desktop/nautilus-desktop-link.c
index f6decb6f9..df2566361 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/nautilus-desktop/nautilus-desktop-link.c
@@ -20,17 +20,21 @@
*/
#include <config.h>
+
#include "nautilus-desktop-link.h"
#include "nautilus-desktop-link-monitor.h"
#include "nautilus-desktop-icon-file.h"
#include "nautilus-directory-private.h"
#include "nautilus-desktop-directory.h"
-#include "nautilus-icon-names.h"
+
#include <glib/gi18n.h>
#include <gio/gio.h>
+
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-trash-monitor.h>
#include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-icon-names.h>
+
#include <string.h>
struct NautilusDesktopLinkDetails {
diff --git a/libnautilus-private/nautilus-desktop-link.h b/nautilus-desktop/nautilus-desktop-link.h
index 7c1025b40..7c1025b40 100644
--- a/libnautilus-private/nautilus-desktop-link.h
+++ b/nautilus-desktop/nautilus-desktop-link.h
diff --git a/libnautilus-private/nautilus-desktop-metadata.c b/nautilus-desktop/nautilus-desktop-metadata.c
index e9ef2d6b5..91a120095 100644
--- a/libnautilus-private/nautilus-desktop-metadata.c
+++ b/nautilus-desktop/nautilus-desktop-metadata.c
@@ -24,8 +24,8 @@
#include "nautilus-desktop-metadata.h"
-#include "nautilus-file-utilities.h"
-#include "nautilus-keyfile-metadata.h"
+#include <libnautilus-private/nautilus-file-utilities.h>
+#include <libnautilus-private/nautilus-keyfile-metadata.h>
static gchar *
get_keyfile_path (void)
diff --git a/libnautilus-private/nautilus-desktop-metadata.h b/nautilus-desktop/nautilus-desktop-metadata.h
index f8c67d3cf..f8c67d3cf 100644
--- a/libnautilus-private/nautilus-desktop-metadata.h
+++ b/nautilus-desktop/nautilus-desktop-metadata.h
diff --git a/src/nautilus-desktop-window-slot.c b/nautilus-desktop/nautilus-desktop-window-slot.c
index d1c05e7fc..d1c05e7fc 100644
--- a/src/nautilus-desktop-window-slot.c
+++ b/nautilus-desktop/nautilus-desktop-window-slot.c
diff --git a/src/nautilus-desktop-window-slot.h b/nautilus-desktop/nautilus-desktop-window-slot.h
index fc895ce63..fcc64afba 100644
--- a/src/nautilus-desktop-window-slot.h
+++ b/nautilus-desktop/nautilus-desktop-window-slot.h
@@ -18,8 +18,8 @@
#ifndef NAUTILUS_DESKTOP_WINDOW_SLOT_H
#define NAUTILUS_DESKTOP_WINDOW_SLOT_H
-#include "nautilus-window-slot.h"
-#include "nautilus-window.h"
+#include <src/nautilus-window-slot.h>
+#include <src/nautilus-window.h>
G_BEGIN_DECLS
diff --git a/src/nautilus-desktop-window.c b/nautilus-desktop/nautilus-desktop-window.c
index 5b78cb38e..3e361be80 100644
--- a/src/nautilus-desktop-window.c
+++ b/nautilus-desktop/nautilus-desktop-window.c
@@ -21,10 +21,10 @@
*/
#include <config.h>
+
#include "nautilus-desktop-window.h"
-#include "nautilus-window.h"
-#include "nautilus-application.h"
#include "nautilus-desktop-window-slot.h"
+#include "nautilus-desktop-link-monitor.h"
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
@@ -33,10 +33,11 @@
#include <glib/gi18n.h>
#include <eel/eel-vfs-extensions.h>
-#include <libnautilus-private/nautilus-desktop-link-monitor.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-icon-names.h>
#include <libnautilus-private/nautilus-global-preferences.h>
+#include <src/nautilus-window.h>
+#include <src/nautilus-application.h>
struct NautilusDesktopWindowDetails {
gulong size_changed_id;
diff --git a/src/nautilus-desktop-window.h b/nautilus-desktop/nautilus-desktop-window.h
index 589d2b48b..818c23bc7 100644
--- a/src/nautilus-desktop-window.h
+++ b/nautilus-desktop/nautilus-desktop-window.h
@@ -26,7 +26,7 @@
#ifndef NAUTILUS_DESKTOP_WINDOW_H
#define NAUTILUS_DESKTOP_WINDOW_H
-#include "nautilus-window.h"
+#include <src/nautilus-window.h>
#define NAUTILUS_TYPE_DESKTOP_WINDOW nautilus_desktop_window_get_type()
#define NAUTILUS_DESKTOP_WINDOW(obj) \
diff --git a/src/Makefile.am b/src/Makefile.am
index e10e7edef..7f485928c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
include $(top_srcdir)/Makefile.shared
+AUTOMAKE_OPTIONS = subdir-objects
+
bin_PROGRAMS= \
nautilus \
- nautilus-desktop \
nautilus-autorun-software \
$(NULL)
+noinst_LTLIBRARIES=libnautilus.la
+
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libnautilus-private \
@@ -26,6 +29,10 @@ AM_CPPFLAGS = \
$(NULL)
LDADD =\
+ libnautilus.la \
+ $(NULL)
+
+libnautilus_la_LIBADD =\
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(top_builddir)/libgd/libgd.la \
$(BASE_LIBS) \
@@ -150,16 +157,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 \
@@ -227,24 +226,13 @@ nautilus_no_main_sources = \
nautilus-x-content-bar.h \
$(NULL)
-nautilus_SOURCES = \
- $(nautilus_no_main_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 = \
+nodist_libnautilus_la_SOURCES = \
$(nautilus_built_sources) \
+ $(nautilus_no_main_sources) \
$(NULL)
-nodist_nautilus_desktop_SOURCES = \
- $(nautilus_built_sources) \
+nautilus_SOURCES = \
+ nautilus-main.c \
$(NULL)
EMPTY_VIEW_SOURCES = \