Move the browser to a dedicated directory

src/.gitignore

@@ -1,4 +1,3 @@
-/browser
 /copy
 /delete
 /move

src/browser/.gitignore

@@ -0,0 +1 @@
+/browser

src/browser/browser.c

@@ -51,7 +51,7 @@ static char const _license[] =
 #include "callbacks.h"
 #include "window.h"
 #include "browser.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 #define N_(string) (string)
 
@@ -60,7 +60,7 @@ static char const _license[] =
 #define COMMON_EXEC
 #define COMMON_GET_ABSOLUTE_PATH
 #define COMMON_SIZE
-#include "common.c"
+#include "../common.c"
 
 /* constants */
 #ifndef PROGNAME

src/browser/browser.h

@@ -36,7 +36,7 @@
 # include <gtk/gtk.h>
 # include <System.h>
 # include <Desktop.h>
-# include "../include/Browser.h"
+# include "../../include/Browser.h"
 
 
 /* Browser */

src/browser/callbacks.c

@@ -49,7 +49,7 @@
 #include <libintl.h>
 #include "callbacks.h"
 #include "browser.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 
 /* constants */
@@ -57,7 +57,7 @@
 # define PROGNAME "browser"
 #endif
 #define COMMON_SYMLINK
-#include "common.c"
+#include "../common.c"
 
 
 /* public */

src/browser/main.c

@@ -36,7 +36,7 @@
 #include <locale.h>
 #include <libintl.h>
 #include "window.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 
 /* constants */

src/browser/project.conf

@@ -0,0 +1,28 @@
+targets=browser
+#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,window.h
+
+[browser]
+type=binary
+depends=$(OBJDIR)../lib/libBrowser.a
+sources=browser.c,callbacks.c,window.c,main.c
+cflags=-fPIE
+ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
+install=$(BINDIR)
+
+[browser.c]
+depends=callbacks.h,../common.c,window.h,browser.h,../../config.h
+cppflags=-D PREFIX=\"$(PREFIX)\"
+
+[callbacks.c]
+depends=browser.h,callbacks.h,../common.c,../../config.h
+
+[window.c]
+depends=browser.h,callbacks.h,window.h,../../config.h
+
+[main.c]
+depends=browser.h

src/browser/window.c

@@ -35,7 +35,7 @@
 #include <Desktop.h>
 #include "callbacks.h"
 #include "window.h"
-#include "../config.h"
+#include "../../config.h"
 #define _(string) gettext(string)
 #define N_(string) (string)
 

src/project.conf

@@ -1,32 +1,11 @@
-subdirs=lib,desktop
-targets=browser,copy,delete,move,open,properties,view
+subdirs=lib,browser,desktop
+targets=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,desktopicon.h,desktopiconwindow.h,window.h
-
-[browser]
-type=binary
-depends=$(OBJDIR)lib/libBrowser.a
-sources=browser.c,callbacks.c,window.c,main.c
-cflags=-fPIE
-ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
-install=$(BINDIR)
-
-[browser.c]
-depends=callbacks.h,common.c,window.h,browser.h,../config.h
-cppflags=-D PREFIX=\"$(PREFIX)\"
-
-[callbacks.c]
-depends=browser.h,callbacks.h,common.c,../config.h
-
-[window.c]
-depends=browser.h,callbacks.h,window.h,../config.h
-
-[main.c]
-depends=browser.h
+dist=Makefile,common.c,common.h
 
 [copy]
 type=binary
@@ -65,7 +44,7 @@ ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [properties.c]
-depends=../include/Browser.h,browser.h,common.c
+depends=../include/Browser.h,browser/browser.h,common.c
 cppflags=-D PREFIX=\"$(PREFIX)\"
 
 [view]
@@ -77,4 +56,4 @@ ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
 install=$(BINDIR)
 
 [view.c]
-depends=common.c
+depends=browser/browser.h,common.c

src/properties.c

@@ -42,7 +42,7 @@
 #include <System.h>
 #include "../include/Browser/vfs.h"
 #define Browser Properties /* XXX */
-#include "browser.h"
+#include "browser/browser.h"
 #include "../config.h"
 #define _(string) gettext(string)
 #define N_(string) (string)

src/view.c

@@ -45,7 +45,7 @@ static char const _license[] =
 #include <Desktop.h>
 #include "../include/Browser/vfs.h"
 #define Browser View /* XXX */
-#include "browser.h"
+#include "browser/browser.h"
 #include "../config.h"
 #define _(string) gettext(string)
 #define N_(string) (string)

src/widget/browser.c

@@ -32,18 +32,18 @@
 #include <gtk/gtk.h>
 #include <System.h>
 #include <Desktop.h>
-#include "../browser.h"
-#include "../callbacks.h"
+#include "../browser/browser.h"
+#include "../browser/callbacks.h"
 
-#include "../browser.c"
+#include "../browser/browser.c"
 /* XXX */
 #undef COMMON_CONFIG_FILENAME
 #undef COMMON_DND
 #undef COMMON_EXEC
 #undef COMMON_GET_ABSOLUTE_PATH
 #undef COMMON_SIZE
-#include "../callbacks.c"
-#include "../window.c"
+#include "../browser/callbacks.c"
+#include "../browser/window.c"
 
 
 /* BrowserWidget */

src/widget/project.conf

@@ -11,4 +11,4 @@ sources=browser.c
 install=$(LIBDIR)/Desktop/widget
 
 [widget.c]
-depends=../browser.c,../callbacks.c,../window.c,../browser.h,../callbacks.h,../window.h
+depends=../browser/browser.c,../browser/callbacks.c,../browser/window.c,../browser/browser.h,../browser/callbacks.h,../browser/window.h