Refactor: move view_file implementations to their own subdirectory.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3900a39..15bdf1b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,12 +81,14 @@ extra_SLIK = \
        $(extra_ICONS)
 
 include $(srcdir)/pan-view/Makefile.am
+include $(srcdir)/view_file/Makefile.am
 
 bin_PROGRAMS = geeqie
 
 geeqie_SOURCES = \
        $(module_SLIK)  \
        $(module_pan_view)      \
+       $(module_view_file)     \
        ClayRGB1998.icc \
        ClayRGB1998_icc.h \
        advanced_exif.c \
@@ -251,10 +253,6 @@ geeqie_SOURCES = \
        view_dir_tree.h \
        view_file.c     \
        view_file.h     \
-       view_file_list.c        \
-       view_file_list.h        \
-       view_file_icon.c        \
-       view_file_icon.h        \
        window.c        \
        window.h        \
        lua.c           \

diff --git a/src/view_file.c b/src/view_file.c
index 7fc5017..d537e8a 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -31,8 +31,8 @@
 #include "ui_menu.h"
 #include "ui_fileops.h"
 #include "utilops.h"
-#include "view_file_list.h"
-#include "view_file_icon.h"
+#include "view_file/view_file_list.h"
+#include "view_file/view_file_icon.h"
 
 /*
  *-----------------------------------------------------------------------------

diff --git a/src/view_file/Makefile.am b/src/view_file/Makefile.am
new file mode 100644 (file)
index 0000000..6837e72
--- /dev/null
+++ b/src/view_file/Makefile.am
@@ -0,0 +1,5 @@
+module_view_file = \
+       %D%/view_file_icon.c    \
+       %D%/view_file_icon.h    \
+       %D%/view_file_list.c    \
+       %D%/view_file_list.h

diff --git a/src/view_file_icon.c b/src/view_file/view_file_icon.c
similarity index 100%
rename from src/view_file_icon.c
rename to src/view_file/view_file_icon.c

diff --git a/src/view_file_icon.h b/src/view_file/view_file_icon.h
similarity index 97%
rename from src/view_file_icon.h
rename to src/view_file/view_file_icon.h
index 086491b..1cdc867 100644 (file)
--- a/src/view_file_icon.h
+++ b/src/view_file/view_file_icon.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef VIEW_FILE_ICON_H
-#define VIEW_FILE_ICON_H
+#ifndef VIEW_FILE_VIEW_FILE_ICON_H
+#define VIEW_FILE_VIEW_FILE_ICON_H
 
 gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
 gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);

diff --git a/src/view_file_list.c b/src/view_file/view_file_list.c
similarity index 100%
rename from src/view_file_list.c
rename to src/view_file/view_file_list.c

diff --git a/src/view_file_list.h b/src/view_file/view_file_list.h
similarity index 97%
rename from src/view_file_list.h
rename to src/view_file/view_file_list.h
index ca9e75d..217b35a 100644 (file)
--- a/src/view_file_list.h
+++ b/src/view_file/view_file_list.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef VIEW_FILE_LIST_H
-#define VIEW_FILE_LIST_H
+#ifndef VIEW_FILE_VIEW_FILE_LIST_H
+#define VIEW_FILE_VIEW_FILE_LIST_H
 
 
 #include "filedata.h"