From 8e1209d464ba70a76c5fb92977ec6bfb70c8f9fb Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 01 Nov 2017 12:54:02 -0400 Subject: src/config.[ch], src/settings.[ch]: Move under src/config/ --- diff --git a/src/application.c b/src/application.c index 2dbd61a..8d7b1d2 100644 --- a/src/application.c +++ b/src/application.c @@ -30,7 +30,7 @@ #include #include -#include "config.h" +#include "config/config.h" #include "download.h" #include "schemes/about.h" #include "schemes/view-source.h" diff --git a/src/application.h b/src/application.h index 506d1f5..c661af5 100644 --- a/src/application.h +++ b/src/application.h @@ -27,7 +27,7 @@ typedef struct MqApplication MqApplication; #include #include -#include "config.h" +#include "config/config.h" #include "tab-page.h" #include "window.h" diff --git a/src/config.c b/src/config/config.c index 8b46fb1..8b46fb1 100644 --- a/src/config.c +++ b/src/config/config.c diff --git a/src/config.h b/src/config/config.h index 93af5f8..93af5f8 100644 --- a/src/config.h +++ b/src/config/config.h diff --git a/src/settings.c b/src/config/settings.c index a271613..a271613 100644 --- a/src/settings.c +++ b/src/config/settings.c diff --git a/src/settings.h b/src/config/settings.h index 2424c59..2424c59 100644 --- a/src/settings.h +++ b/src/config/settings.h diff --git a/src/download.c b/src/download.c index ad8f9c3..dd74487 100644 --- a/src/download.c +++ b/src/download.c @@ -24,7 +24,7 @@ #include #include -#include "config.h" +#include "config/config.h" struct _MqDownload { MqConfig *config; diff --git a/src/download.h b/src/download.h index 92681fc..652b366 100644 --- a/src/download.h +++ b/src/download.h @@ -26,7 +26,7 @@ typedef struct _MqDownload MqDownload; #include -#include "config.h" +#include "config/config.h" G_BEGIN_DECLS diff --git a/src/local.mk b/src/local.mk index 897b684..dbe8fdf 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,16 +1,15 @@ marquee_SOURCES += \ %reldir%/application.c \ - %reldir%/config.c \ %reldir%/download.c \ %reldir%/main.c \ %reldir%/notebook.c \ - %reldir%/settings.c \ %reldir%/tab-label.c \ %reldir%/tab-page.c \ %reldir%/tree.c \ %reldir%/web-view.c \ %reldir%/window.c +include %reldir%/config/local.mk include %reldir%/schemes/local.mk include %reldir%/toolbars/local.mk include %reldir%/utils/local.mk diff --git a/src/schemes/about/preferences.c b/src/schemes/about/preferences.c index 669dd62..6563f48 100644 --- a/src/schemes/about/preferences.c +++ b/src/schemes/about/preferences.c @@ -23,7 +23,7 @@ #include #include "../../application.h" -#include "../../config.h" +#include "../../config/config.h" #include "../../utils/html.h" #include "../about.h" #include "paths.h" diff --git a/src/toolbars/navigation-toolbar.c b/src/toolbars/navigation-toolbar.c index 692a565..05090eb 100644 --- a/src/toolbars/navigation-toolbar.c +++ b/src/toolbars/navigation-toolbar.c @@ -25,7 +25,7 @@ #include #include -#include "../config.h" +#include "../config/config.h" #include "../tab-page.h" #include "../web-view.h" #include "find-toolbar.h" diff --git a/src/toolbars/navigation/home-button.c b/src/toolbars/navigation/home-button.c index a9d5f75..98f3ca1 100644 --- a/src/toolbars/navigation/home-button.c +++ b/src/toolbars/navigation/home-button.c @@ -25,7 +25,7 @@ #include #include -#include "../../config.h" +#include "../../config/config.h" #include "../../web-view.h" struct _MqHomeButton { diff --git a/src/toolbars/navigation/home-button.h b/src/toolbars/navigation/home-button.h index af1d448..4aa4d81 100644 --- a/src/toolbars/navigation/home-button.h +++ b/src/toolbars/navigation/home-button.h @@ -28,7 +28,7 @@ typedef struct _MqHomeButtonClass MqHomeButtonClass; #include #include -#include "../../config.h" +#include "../../config/config.h" #include "../../web-view.h" G_BEGIN_DECLS diff --git a/src/web-view-schemes/normal.c b/src/web-view-schemes/normal.c index 03cdf0e..cb6c58a 100644 --- a/src/web-view-schemes/normal.c +++ b/src/web-view-schemes/normal.c @@ -28,9 +28,9 @@ #include #include "../application.h" -#include "../config.h" +#include "../config/config.h" +#include "../config/settings.h" #include "../notebook.h" -#include "../settings.h" #include "../tab-page.h" #include "../web-view.h" diff --git a/src/web-view-schemes/view-source.c b/src/web-view-schemes/view-source.c index f241b65..90b0b85 100644 --- a/src/web-view-schemes/view-source.c +++ b/src/web-view-schemes/view-source.c @@ -28,8 +28,8 @@ #include #include "../application.h" -#include "../config.h" -#include "../settings.h" +#include "../config/config.h" +#include "../config/settings.h" #include "../tab-page.h" #include "../utils/string.h" #include "../web-view.h" diff --git a/src/web-view.c b/src/web-view.c index b59a858..d018dcf 100644 --- a/src/web-view.c +++ b/src/web-view.c @@ -28,7 +28,7 @@ #include #include -#include "config.h" +#include "config/config.h" #include "notebook.h" #include "tab-page.h" #include "web-view-schemes/schemes.h" diff --git a/src/web-view.h b/src/web-view.h index 9824e09..30de801 100644 --- a/src/web-view.h +++ b/src/web-view.h @@ -29,7 +29,7 @@ typedef struct _MqWebViewClass MqWebViewClass; #include #include -#include "config.h" +#include "config/config.h" #include "tab-page.h" #include "web-view-schemes/schemes.h" diff --git a/src/window.c b/src/window.c index db0ff91..b771a8b 100644 --- a/src/window.c +++ b/src/window.c @@ -27,7 +27,7 @@ #include #include "application.h" -#include "config.h" +#include "config/config.h" #include "notebook.h" #include "tab-page.h" diff --git a/src/window.h b/src/window.h index a32e550..1570a0b 100644 --- a/src/window.h +++ b/src/window.h @@ -29,7 +29,7 @@ typedef struct _MqWindowClass MqWindowClass; #include #include "application.h" -#include "config.h" +#include "config/config.h" #include "tab-page.h" G_BEGIN_DECLS -- cgit v0.9.1