eeshow/delta.c: goes to kicad/

eeshow/Makefile

@@ -13,10 +13,9 @@
 NAME = eeshow
 OBJS = main.o \
        kicad/sch-parse.o kicad/sch-render.o kicad/lib-parse.o \
-       kicad/lib-render.o kicad/dwg.o \
+       kicad/lib-render.o kicad/dwg.o kicad/delta.o \
        gui/gui.o gui/over.o gui/style.o gui/aoi.o gui/fmt-pango.o \
        file/file.o file/git-util.o file/git-file.o file/git-hist.o \
-       delta.o \
        gfx/style.o gfx/fig.o gfx/record.o gfx/cro.o gfx/diff.o gfx/gfx.o \
        gfx/text.o gfx/misc.o \
        diag.o

eeshow/gui/gui.c

@@ -36,7 +36,7 @@
 #include "file/git-hist.h"
 #include "kicad/lib.h"
 #include "kicad/sch.h"
-#include "delta.h"
+#include "kicad/delta.h"
 #include "gfx/diff.h"
 #include "kicad/dwg.h"
 #include "gui/fmt-pango.h"

eeshow/kicad/delta.c

@@ -1,5 +1,5 @@
 /*
- * delta.c - Find differences in .sch files
+ * kicad/delta.c - Find differences in .sch files
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -20,7 +20,7 @@
 #include "gfx/text.h"
 #include "kicad/lib.h"
 #include "kicad/sch.h"
-#include "delta.h"
+#include "kicad/delta.h"
 
 
 /*

eeshow/kicad/delta.h

@@ -1,5 +1,5 @@
 /*
- * delta.h - Find differences in .sch files
+ * kicad/delta.h - Find differences in .sch files
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -11,8 +11,8 @@
  */
 
 
-#ifndef DELTA_H
-#define DELTA_H
+#ifndef KICAD_DELTA_H
+#define KICAD_DELTA_H
 
 #include "kicad/sch.h"
 
@@ -23,4 +23,4 @@ void delta(const struct sheet *a, const struct sheet *b,
     struct sheet *res_a, struct sheet *res_b, struct sheet *res_ab);
 void delta_free(struct sheet *d);
 
-#endif /* !DELTA_H */
+#endif /* !KICAD_DELTA_H */