Move the desktop to a dedicated directory

src/.gitignore

@@ -1,8 +1,6 @@
 /browser
 /copy
 /delete
-/desktop
-/desktopctl
 /move
 /open
 /properties

src/desktop/.gitignore

@@ -0,0 +1,2 @@
+/desktop
+/desktopctl

src/desktop/desktop.c

@@ -50,17 +50,17 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrandr.h>
 #include <System.h>
-#include "../include/Browser/desktop.h"
+#include "../../include/Browser/desktop.h"
-#include "../include/Browser/vfs.h"
+#include "../../include/Browser/vfs.h"
 #include "desktopicon.h"
 #include "desktopiconwindow.h"
 #include "desktop.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 #define N_(string) string
 
 #define COMMON_SYMLINK
-#include "common.c"
+#include "../common.c"
 
 
 /* constants */

src/desktop/desktop.h

@@ -34,8 +34,8 @@
 
 # include <gtk/gtk.h>
 # include <Desktop.h>
-# include "../include/Browser.h"
+# include "../../include/Browser.h"
-# include "common.h"
+# include "../common.h"
 
 
 /* Desktop */

src/desktop/desktopctl.c

@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011-2016 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Browser */
 /* Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -36,8 +36,8 @@
 #include <libintl.h>
 #include <gtk/gtk.h>
 #include <Desktop.h>
-#include "../include/Browser/desktop.h"
+#include "../../include/Browser/desktop.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 
 /* constants */

src/desktop/desktopicon.c

@@ -40,16 +40,16 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <System.h>
-#include "../include/Browser/desktop.h"
+#include "../../include/Browser/desktop.h"
-#include "../include/Browser/vfs.h"
+#include "../../include/Browser/vfs.h"
 #include "desktop.h"
 #include "desktopicon.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 
 #define COMMON_DND
 #define COMMON_EXEC
-#include "common.c"
+#include "../common.c"
 
 
 /* constants */

src/desktop/desktopicon.h

@@ -33,7 +33,7 @@
 # define BROWSER_DESKTOPICON_H
 
 # include <gtk/gtk.h>
-# include "common.h"
+# include "../common.h"
 
 
 /* DesktopIcon */

src/desktop/desktopiconwindow.h

@@ -32,7 +32,7 @@
 #ifndef BROWSER_DESKTOPICONWINDOW_H
 # define BROWSER_DESKTOPICONWINDOW_H
 
-# include "common.h"
+# include "../common.h"
 
 
 /* DesktopIconWindow */

src/desktop/project.conf

@@ -0,0 +1,36 @@
+targets=desktop,desktopctl
+#cppflags=-D EMBEDDED
+cflags_force=`pkg-config --cflags libDesktop`
+cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ldflags_force=`pkg-config --libs libDesktop` -lintl
+ldflags=-Wl,-z,relro -Wl,-z,now
+dist=Makefile,desktop.h,desktopicon.h,desktopiconwindow.h
+
+[desktop]
+type=binary
+depends=$(OBJDIR)../lib/libBrowser.a
+sources=desktop.c,desktopicon.c,desktopiconwindow.c
+cflags=`pkg-config --cflags x11 xrandr` -fPIE
+ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+install=$(BINDIR)
+
+[desktop.c]
+depends=../common.h,../common.c,desktopicon.h,desktop.h,../../config.h
+cppflags=-D PREFIX=\"$(PREFIX)\"
+
+[desktopicon.c]
+depends=../common.h,../common.c,desktop.h,desktopicon.h,../../config.h
+cppflags=-D PREFIX=\"$(PREFIX)\"
+
+[desktopiconwindow.c]
+depends=../common.h,desktop.h,desktopicon.h,desktopiconwindow.h
+
+[desktopctl]
+type=binary
+sources=desktopctl.c
+cflags=-fPIE
+ldflags=-pie
+install=$(BINDIR)
+
+[desktopctl.c]
+depends=desktop.h,../../config.h

src/project.conf

@@ -1,11 +1,11 @@
-subdirs=lib
+subdirs=lib,desktop
-targets=browser,copy,delete,desktop,desktopctl,move,open,properties,view
+targets=browser,copy,delete,move,open,properties,view
 #cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-Wl,-z,relro -Wl,-z,now
-dist=Makefile,browser.h,callbacks.h,common.c,common.h,desktop.h,desktopicon.h,desktopiconwindow.h,window.h
+dist=Makefile,browser.h,callbacks.h,common.c,common.h,desktopicon.h,desktopiconwindow.h,window.h
 
 [browser]
 type=binary
@@ -42,35 +42,6 @@ cflags=-fPIE
 ldflags=-pie
 install=$(BINDIR)
 
-[desktop]
-type=binary
-depends=$(OBJDIR)lib/libBrowser.a
-sources=desktop.c,desktopicon.c,desktopiconwindow.c
-cflags=`pkg-config --cflags x11 xrandr` -fPIE
-ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
-install=$(BINDIR)
-
-[desktop.c]
-depends=common.h,common.c,desktopicon.h,desktop.h,../config.h
-cppflags=-D PREFIX=\"$(PREFIX)\"
-
-[desktopicon.c]
-depends=common.h,common.c,desktop.h,desktopicon.h,../config.h
-cppflags=-D PREFIX=\"$(PREFIX)\"
-
-[desktopiconwindow.c]
-depends=common.h,desktop.h,desktopicon.h,desktopiconwindow.h
-
-[desktopctl]
-type=binary
-sources=desktopctl.c
-cflags=-fPIE
-ldflags=-pie
-install=$(BINDIR)
-
-[desktopctl.c]
-depends=desktop.h,../config.h
-
 [move]
 type=binary
 sources=move.c