From c8474a23c4b9b20b7123dee36f7b04617d0e4168 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 9 Oct 2016 03:12:13 +0200 Subject: [PATCH] Move the desktop to a dedicated directory --- src/.gitignore | 2 -- src/desktop/.gitignore | 2 ++ src/{ => desktop}/desktop.c | 8 +++--- src/{ => desktop}/desktop.h | 4 +-- src/{ => desktop}/desktopctl.c | 6 ++--- src/{ => desktop}/desktopicon.c | 8 +++--- src/{ => desktop}/desktopicon.h | 2 +- src/{ => desktop}/desktopiconwindow.c | 0 src/{ => desktop}/desktopiconwindow.h | 2 +- src/desktop/project.conf | 36 +++++++++++++++++++++++++++ src/project.conf | 35 +++----------------------- 11 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 src/desktop/.gitignore rename src/{ => desktop}/desktop.c (99%) rename src/{ => desktop}/desktop.h (98%) rename src/{ => desktop}/desktopctl.c (97%) rename src/{ => desktop}/desktopicon.c (99%) rename src/{ => desktop}/desktopicon.h (99%) rename src/{ => desktop}/desktopiconwindow.c (100%) rename src/{ => desktop}/desktopiconwindow.h (98%) create mode 100644 src/desktop/project.conf diff --git a/src/.gitignore b/src/.gitignore index a10bc26..db2ae48 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,8 +1,6 @@ /browser /copy /delete -/desktop -/desktopctl /move /open /properties diff --git a/src/desktop/.gitignore b/src/desktop/.gitignore new file mode 100644 index 0000000..3ed7460 --- /dev/null +++ b/src/desktop/.gitignore @@ -0,0 +1,2 @@ +/desktop +/desktopctl diff --git a/src/desktop.c b/src/desktop/desktop.c similarity index 99% rename from src/desktop.c rename to src/desktop/desktop.c index c4aea6b..b960350 100644 --- a/src/desktop.c +++ b/src/desktop/desktop.c @@ -50,17 +50,17 @@ #include #include #include -#include "../include/Browser/desktop.h" -#include "../include/Browser/vfs.h" +#include "../../include/Browser/desktop.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 */ diff --git a/src/desktop.h b/src/desktop/desktop.h similarity index 98% rename from src/desktop.h rename to src/desktop/desktop.h index ad1e0ed..7fd2e11 100644 --- a/src/desktop.h +++ b/src/desktop/desktop.h @@ -34,8 +34,8 @@ # include # include -# include "../include/Browser.h" -# include "common.h" +# include "../../include/Browser.h" +# include "../common.h" /* Desktop */ diff --git a/src/desktopctl.c b/src/desktop/desktopctl.c similarity index 97% rename from src/desktopctl.c rename to src/desktop/desktopctl.c index b1fb070..ae6b6f8 100644 --- a/src/desktopctl.c +++ b/src/desktop/desktopctl.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2011-2012 Pierre Pronchery */ +/* Copyright (c) 2011-2016 Pierre Pronchery */ /* 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 #include #include -#include "../include/Browser/desktop.h" -#include "../config.h" +#include "../../include/Browser/desktop.h" +#include "../../config.h" #define _(string) gettext(string) /* constants */ diff --git a/src/desktopicon.c b/src/desktop/desktopicon.c similarity index 99% rename from src/desktopicon.c rename to src/desktop/desktopicon.c index c2a269f..f67a063 100644 --- a/src/desktopicon.c +++ b/src/desktop/desktopicon.c @@ -40,16 +40,16 @@ #include #include #include -#include "../include/Browser/desktop.h" -#include "../include/Browser/vfs.h" +#include "../../include/Browser/desktop.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 */ diff --git a/src/desktopicon.h b/src/desktop/desktopicon.h similarity index 99% rename from src/desktopicon.h rename to src/desktop/desktopicon.h index 7cef55c..a39648f 100644 --- a/src/desktopicon.h +++ b/src/desktop/desktopicon.h @@ -33,7 +33,7 @@ # define BROWSER_DESKTOPICON_H # include -# include "common.h" +# include "../common.h" /* DesktopIcon */ diff --git a/src/desktopiconwindow.c b/src/desktop/desktopiconwindow.c similarity index 100% rename from src/desktopiconwindow.c rename to src/desktop/desktopiconwindow.c diff --git a/src/desktopiconwindow.h b/src/desktop/desktopiconwindow.h similarity index 98% rename from src/desktopiconwindow.h rename to src/desktop/desktopiconwindow.h index 20eba03..ad1370d 100644 --- a/src/desktopiconwindow.h +++ b/src/desktop/desktopiconwindow.h @@ -32,7 +32,7 @@ #ifndef BROWSER_DESKTOPICONWINDOW_H # define BROWSER_DESKTOPICONWINDOW_H -# include "common.h" +# include "../common.h" /* DesktopIconWindow */ diff --git a/src/desktop/project.conf b/src/desktop/project.conf new file mode 100644 index 0000000..f8f1cef --- /dev/null +++ b/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 diff --git a/src/project.conf b/src/project.conf index 6a29082..e49c2db 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,11 +1,11 @@ -subdirs=lib -targets=browser,copy,delete,desktop,desktopctl,move,open,properties,view +subdirs=lib,desktop +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