From: Omari Stephens <xsdg@google.com>
Date: Sat, 24 Dec 2016 05:38:38 +0000 (+0000)
Subject: Move pan-view components to their own subdir.
X-Git-Tag: v1.4~235^2
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=58d397efc9e99104d21ea686837396673939ccde

Move pan-view components to their own subdir.

This makes it easier to modularize pan-view without cluttering the src dir
with extra files, and without worrying as much about exposing pan-view-internal
APIs to the rest of Geeqie.
---

diff --git a/.gitignore b/.gitignore
index 014321ee..4b906f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,10 @@ Makefile.in
 # /src/icons/
 /src/icons/icons_inline.h
 
+# /src/pan-view/
+/src/pan-view/.deps
+/src/pan-view/.dirstamp
+
 /build-stamp
 /debian/geeqie*
 /debian/files
diff --git a/configure.in b/configure.in
index e349cfd7..806817c7 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,8 @@ AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short master), [
 AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_AUX_DIR(auxdir)
-AM_INIT_AUTOMAKE
+# Require Automake 1.14 for %reldir% support
+AM_INIT_AUTOMAKE([1.14.1 subdir-objects])
 
 AC_CONFIG_HEADER([config.h])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b78e258a..151c658e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,10 +80,13 @@ CLEANFILES = $(noinst_DATA)
 extra_SLIK = \
 	$(extra_ICONS)
 
+include $(srcdir)/pan-view/Makefile.am
+
 bin_PROGRAMS = geeqie
 
 geeqie_SOURCES = \
 	$(module_SLIK)	\
+	$(module_pan_view)	\
 	ClayRGB1998.icc \
 	ClayRGB1998_icc.h \
 	advanced_exif.c	\
@@ -202,20 +205,6 @@ geeqie_SOURCES = \
 	misc.h		\
 	options.c	\
 	options.h	\
-	pan-calendar.c	\
-	pan-calendar.h	\
-	pan-folder.c	\
-	pan-folder.h	\
-	pan-grid.c	\
-	pan-grid.h	\
-	pan-item.c	\
-	pan-item.h	\
-	pan-timeline.c	\
-	pan-timeline.h	\
-	pan-types.h	\
-	pan-util.c	\
-	pan-util.h	\
-	pan-view.c	\
 	pan-view.h	\
 	pixbuf-renderer.c	\
 	pixbuf-renderer.h	\
diff --git a/src/pan-view.h b/src/pan-view.h
index 2d8a6b81..791d4c3f 100644
--- a/src/pan-view.h
+++ b/src/pan-view.h
@@ -22,18 +22,9 @@
 #ifndef PAN_VIEW_H
 #define PAN_VIEW_H
 
-#include "main.h"
-#include "pan-types.h"
+#include "filedata.h"
 
 void pan_window_new(FileData *dir_fd);
 
-GList *pan_layout_intersect(PanWindow *pw, gint x, gint y, gint width, gint height);
-void pan_layout_resize(PanWindow *pw);
-
-void pan_cache_sync_date(PanWindow *pw, GList *list);
-
-GList *pan_cache_sort(GList *list, SortType method, gboolean ascend);
-
-
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
diff --git a/src/pan-view/Makefile.am b/src/pan-view/Makefile.am
new file mode 100644
index 00000000..70c9423f
--- /dev/null
+++ b/src/pan-view/Makefile.am
@@ -0,0 +1,16 @@
+module_pan_view = \
+	%D%/pan-calendar.c	\
+	%D%/pan-calendar.h	\
+	%D%/pan-folder.c	\
+	%D%/pan-folder.h	\
+	%D%/pan-grid.c	\
+	%D%/pan-grid.h	\
+	%D%/pan-item.c	\
+	%D%/pan-item.h	\
+	%D%/pan-timeline.c	\
+	%D%/pan-timeline.h	\
+	%D%/pan-types.h	\
+	%D%/pan-util.c	\
+	%D%/pan-util.h	\
+	%D%/pan-view.c	\
+	%D%/pan-view.h
diff --git a/src/pan-calendar.c b/src/pan-view/pan-calendar.c
similarity index 100%
rename from src/pan-calendar.c
rename to src/pan-view/pan-calendar.c
diff --git a/src/pan-calendar.h b/src/pan-view/pan-calendar.h
similarity index 94%
rename from src/pan-calendar.h
rename to src/pan-view/pan-calendar.h
index 5586376c..cc5eb816 100644
--- a/src/pan-calendar.h
+++ b/src/pan-view/pan-calendar.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_CALENDAR_H
-#define PAN_CALENDAR_H
+#ifndef PAN_VIEW_PAN_CALENDAR_H
+#define PAN_VIEW_PAN_CALENDAR_H
 
 //#include "main.h"
 #include "pan-item.h"
diff --git a/src/pan-folder.c b/src/pan-view/pan-folder.c
similarity index 100%
rename from src/pan-folder.c
rename to src/pan-view/pan-folder.c
diff --git a/src/pan-folder.h b/src/pan-view/pan-folder.h
similarity index 94%
rename from src/pan-folder.h
rename to src/pan-view/pan-folder.h
index 778fc17a..e9cc2619 100644
--- a/src/pan-folder.h
+++ b/src/pan-view/pan-folder.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_FOLDER_H
-#define PAN_FOLDER_H
+#ifndef PAN_VIEW_PAN_FOLDER_H
+#define PAN_VIEW_PAN_FOLDER_H
 
 #include "main.h"
 #include "pan-types.h"
diff --git a/src/pan-grid.c b/src/pan-view/pan-grid.c
similarity index 100%
rename from src/pan-grid.c
rename to src/pan-view/pan-grid.c
diff --git a/src/pan-grid.h b/src/pan-view/pan-grid.h
similarity index 94%
rename from src/pan-grid.h
rename to src/pan-view/pan-grid.h
index 14aaffd1..a8985228 100644
--- a/src/pan-grid.h
+++ b/src/pan-view/pan-grid.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_GRID_H
-#define PAN_GRID_H
+#ifndef PAN_VIEW_PAN_GRID_H
+#define PAN_VIEW_PAN_GRID_H
 
 #include "main.h"
 #include "pan-types.h"
diff --git a/src/pan-item.c b/src/pan-view/pan-item.c
similarity index 100%
rename from src/pan-item.c
rename to src/pan-view/pan-item.c
diff --git a/src/pan-item.h b/src/pan-view/pan-item.h
similarity index 98%
rename from src/pan-item.h
rename to src/pan-view/pan-item.h
index 7ed73357..2b72f0b3 100644
--- a/src/pan-item.h
+++ b/src/pan-view/pan-item.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_ITEM_H
-#define PAN_ITEM_H
+#ifndef PAN_VIEW_PAN_ITEM_H
+#define PAN_VIEW_PAN_ITEM_H
 
 #include "main.h"
 #include "pan-types.h"
diff --git a/src/pan-timeline.c b/src/pan-view/pan-timeline.c
similarity index 100%
rename from src/pan-timeline.c
rename to src/pan-view/pan-timeline.c
diff --git a/src/pan-timeline.h b/src/pan-view/pan-timeline.h
similarity index 93%
rename from src/pan-timeline.h
rename to src/pan-view/pan-timeline.h
index 78bf78ab..7cfba941 100644
--- a/src/pan-timeline.h
+++ b/src/pan-view/pan-timeline.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_TIMELINE_H
-#define PAN_TIMELINE_H
+#ifndef PAN_VIEW_PAN_TIMELINE_H
+#define PAN_VIEW_PAN_TIMELINE_H
 
 #include "main.h"
 #include "pan-types.h"
diff --git a/src/pan-types.h b/src/pan-view/pan-types.h
similarity index 98%
rename from src/pan-types.h
rename to src/pan-view/pan-types.h
index 13931d01..5318b38f 100644
--- a/src/pan-types.h
+++ b/src/pan-view/pan-types.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_TYPES_H
-#define PAN_TYPES_H
+#ifndef PAN_VIEW_PAN_TYPES_H
+#define PAN_VIEW_PAN_TYPES_H
 
 #include "cache-loader.h"
 #include "filedata.h"
diff --git a/src/pan-util.c b/src/pan-view/pan-util.c
similarity index 100%
rename from src/pan-util.c
rename to src/pan-view/pan-util.c
diff --git a/src/pan-util.h b/src/pan-view/pan-util.h
similarity index 96%
rename from src/pan-util.h
rename to src/pan-view/pan-util.h
index 7fb5c143..b700c81d 100644
--- a/src/pan-util.h
+++ b/src/pan-view/pan-util.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PAN_UTIL_H
-#define PAN_UTIL_H
+#ifndef PAN_VIEW_PAN_UTIL_H
+#define PAN_VIEW_PAN_UTIL_H
 
 #include "main.h"
 #include "pan-types.h"
diff --git a/src/pan-view.c b/src/pan-view/pan-view.c
similarity index 100%
rename from src/pan-view.c
rename to src/pan-view/pan-view.c
diff --git a/src/pan-view/pan-view.h b/src/pan-view/pan-view.h
new file mode 100644
index 00000000..7a7ddc7d
--- /dev/null
+++ b/src/pan-view/pan-view.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
+ *
+ * Author: John Ellis
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef PAN_VIEW_PAN_VIEW_H
+#define PAN_VIEW_PAN_VIEW_H
+
+#include "main.h"
+#include "pan-types.h"
+
+GList *pan_layout_intersect(PanWindow *pw, gint x, gint y, gint width, gint height);
+void pan_layout_resize(PanWindow *pw);
+
+void pan_cache_sync_date(PanWindow *pw, GList *list);
+
+GList *pan_cache_sort(GList *list, SortType method, gboolean ascend);
+
+
+#endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */