eeshow/: move gui* into subdirectory gui/

eeshow/Makefile

@@ -12,12 +12,13 @@
 
 NAME = eeshow
 OBJS = main.o sch-parse.o sch-render.o lib-parse.o lib-render.o \
-       gui.o gui-over.o gui-style.o gui-aoi.o fmt-pango.o \
+       gui/gui.o gui/over.o gui/style.o gui/aoi.o fmt-pango.o \
        file.o git-util.o git-file.o git-hist.o delta.o \
        style.o fig.o record.o cro.o diff.o gfx.o dwg.o text.o misc.o diag.o
 
 CFLAGS = -g  -Wall -Wextra -Wno-unused-parameter -Wshadow \
 	 -Wmissing-prototypes -Wmissing-declarations \
+	 -I. \
 	 `pkg-config --cflags cairo` \
 	 `pkg-config --cflags libgit2` \
 	 `pkg-config --cflags gtk+-3.0`

eeshow/gui/aoi.c

@@ -1,5 +1,5 @@
 /*
- * gui-aoi.c - GUI: areas of interest
+ * gui/aoi.c - GUI: areas of interest
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include "util.h"
-#include "gui-aoi.h"
+#include "gui/aoi.h"
 
 
 #define	DRAG_RADIUS	5

eeshow/gui/aoi.h

@@ -1,5 +1,5 @@
 /*
- * gui-aoi.h - GUI: areas of interest
+ * gui/aoi.h - GUI: areas of interest
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger

eeshow/gui/gui.c

@@ -1,5 +1,5 @@
 /*
- * gui.c - GUI for eeshow
+ * gui/gui.c - GUI for eeshow
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -38,10 +38,10 @@
 #include "delta.h"
 #include "diff.h"
 #include "dwg.h"
-#include "gui-aoi.h"
+#include "gui/aoi.h"
-#include "gui-style.h"
+#include "gui/style.h"
-#include "gui-over.h"
+#include "gui/over.h"
-#include "gui.h"
+#include "gui/gui.h"
 
 
 struct gui_ctx;

eeshow/gui/gui.h

@@ -1,5 +1,5 @@
 /*
- * gui.h - GUI for eeshow
+ * gui/gui.h - GUI for eeshow
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef GUI_H
+#ifndef GUI_GUI_H
-#define	GUI_H
+#define	GUI_GUI_H
 
 #include <stdbool.h>
 
@@ -22,4 +22,4 @@
 
 int gui(unsigned n_args, char **args, bool recurse, int limit);
 
-#endif /* !GUI_H */
+#endif /* !GUI_GUI_H */

eeshow/gui/over.c

@@ -1,5 +1,5 @@
 /*
- * gui-over.c - GUI: overlays
+ * gui/over.c - GUI: overlays
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -32,9 +32,9 @@
 
 #include "util.h"
 #include "fmt-pango.h"
-#include "gui-aoi.h"
+#include "gui/aoi.h"
-#include "gui-style.h"
+#include "gui/style.h"
-#include "gui-over.h"
+#include "gui/over.h"
 
 
 struct overlay {

eeshow/gui/over.h

@@ -1,5 +1,5 @@
 /*
- * gui-over.h - GUI: overlays
+ * gui/over.h - GUI: overlays
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -18,7 +18,7 @@
 
 #include <cairo/cairo.h>
 
-#include "gui-aoi.h"
+#include "gui/aoi.h"
 
 
 struct color {

eeshow/gui/style.c

@@ -1,5 +1,5 @@
 /*
- * gui-style.c - GUI: overlay styles
+ * gui/style.c - GUI: overlay styles
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,7 +10,7 @@
  * (at your option) any later version.
  */
 
-#include "gui-style.h"
+#include "gui/style.h"
 
 
 #define	OVER_BORDER	8

eeshow/gui/style.h

@@ -1,5 +1,5 @@
 /*
- * gui-style.h - GUI: overlay styles
+ * gui/style.h - GUI: overlay styles
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -13,7 +13,7 @@
 #ifndef GUI_STYLE_H
 #define	GUI_STYLE_H
 
-#include "gui-over.h"
+#include "gui/over.h"
 
 
 #define	NORMAL_FONT	"Helvetica 10"

eeshow/main.c

@@ -30,7 +30,7 @@
 #include "sch.h"
 #include "fmt-pango.h"
 #include "git-hist.h"
-#include "gui.h"
+#include "gui/gui.h"
 #include "main.h"