summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-17 20:54:25 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-17 20:54:25 -0300
commit5014b5de97b9c3fa1600fd8c4d3460520c4ba081 (patch)
treecafd98b7d86d6619c6b9cf13bf42945fca391f57
parent34ea81f8d4018fc3ecf91663d741ae5afcbc26d7 (diff)
downloadeeshow-5014b5de97b9c3fa1600fd8c4d3460520c4ba081.tar.gz
eeshow-5014b5de97b9c3fa1600fd8c4d3460520c4ba081.tar.bz2
eeshow-5014b5de97b9c3fa1600fd8c4d3460520c4ba081.zip
eeshow/: move gui* into subdirectory gui/
-rw-r--r--Makefile3
-rw-r--r--gui/aoi.c (renamed from gui-aoi.c)4
-rw-r--r--gui/aoi.h (renamed from gui-aoi.h)2
-rw-r--r--gui/gui.c (renamed from gui.c)10
-rw-r--r--gui/gui.h (renamed from gui.h)8
-rw-r--r--gui/over.c (renamed from gui-over.c)8
-rw-r--r--gui/over.h (renamed from gui-over.h)4
-rw-r--r--gui/style.c (renamed from gui-style.c)4
-rw-r--r--gui/style.h (renamed from gui-style.h)4
-rw-r--r--main.c2
10 files changed, 25 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 7ec7c1f..9c4f74e 100644
--- a/Makefile
+++ b/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`
diff --git a/gui-aoi.c b/gui/aoi.c
index 2415d45..2e0e6ee 100644
--- a/gui-aoi.c
+++ b/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
diff --git a/gui-aoi.h b/gui/aoi.h
index 783ce91..b804b1b 100644
--- a/gui-aoi.h
+++ b/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
diff --git a/gui.c b/gui/gui.c
index a32609f..5ed3e82 100644
--- a/gui.c
+++ b/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-style.h"
-#include "gui-over.h"
-#include "gui.h"
+#include "gui/aoi.h"
+#include "gui/style.h"
+#include "gui/over.h"
+#include "gui/gui.h"
struct gui_ctx;
diff --git a/gui.h b/gui/gui.h
index 1976a20..04bc1dd 100644
--- a/gui.h
+++ b/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
-#define GUI_H
+#ifndef GUI_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 */
diff --git a/gui-over.c b/gui/over.c
index b648f70..7ee7a91 100644
--- a/gui-over.c
+++ b/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-style.h"
-#include "gui-over.h"
+#include "gui/aoi.h"
+#include "gui/style.h"
+#include "gui/over.h"
struct overlay {
diff --git a/gui-over.h b/gui/over.h
index 43795aa..f340282 100644
--- a/gui-over.h
+++ b/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 {
diff --git a/gui-style.c b/gui/style.c
index 45a3a56..db40ca3 100644
--- a/gui-style.c
+++ b/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
diff --git a/gui-style.h b/gui/style.h
index 9050484..a5e6d4d 100644
--- a/gui-style.h
+++ b/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"
diff --git a/main.c b/main.c
index 6c93129..d6ff527 100644
--- a/main.c
+++ b/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"