summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-02 20:11:51 -0300
committerWerner Almesberger <werner@almesberger.net>2016-09-02 20:11:51 -0300
commitf73bc37c69b03f3fc9be643d04bb62bede128790 (patch)
tree95884495f8a8d3d8833b06c9c254e49b21a6dff5
parent85a2516303231f65fe9699f2e5165d3d3e1f9b9b (diff)
downloadeeshow-f73bc37c69b03f3fc9be643d04bb62bede128790.tar.gz
eeshow-f73bc37c69b03f3fc9be643d04bb62bede128790.tar.bz2
eeshow-f73bc37c69b03f3fc9be643d04bb62bede128790.zip
main.c: move to main/eeshow.c
-rw-r--r--Makefile33
-rw-r--r--main/eeshow.c (renamed from main.c)2
2 files changed, 17 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index f94c77e..c41a38c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,20 +19,19 @@ OBJS_KICAD = \
kicad/lib-render.o kicad/dwg.o kicad/delta.o kicad/sexpr.o \
kicad/pl-parse.o kicad/pl-render.o kicad/ext.o kicad/pro.o
OBJS_FILE = \
- file/file.o file/git-util.o file/git-file.o file/git-hist.o
+ file/file.o file/git-util.o file/git-file.o file/git-hist.o
OBJS_MISC = \
- misc/diag.o misc/util.o
-
-OBJS = main.o version.o \
- main/common.o \
- $(OBJS_KICAD) \
- gui/gui.o gui/over.o gui/style.o gui/aoi.o gui/fmt-pango.o gui/input.o \
- gui/progress.o gui/glabel.o gui/sheet.o gui/history.o gui/render.o \
- gui/help.o gui/icons.o gui/index.o gui/timer.o \
- $(OBJS_FILE) \
- gfx/style.o gfx/fig.o gfx/record.o gfx/cro.o gfx/diff.o gfx/gfx.o \
- gfx/text.o gfx/misc.o gfx/pdftoc.o \
- $(OBJS_MISC)
+ misc/diag.o misc/util.o
+
+EESHOW_OBJS = main/eeshow.o main/common.o version.o \
+ $(OBJS_KICAD) \
+ gui/gui.o gui/over.o gui/style.o gui/aoi.o gui/fmt-pango.o gui/input.o \
+ gui/progress.o gui/glabel.o gui/sheet.o gui/history.o gui/render.o \
+ gui/help.o gui/icons.o gui/index.o gui/timer.o \
+ $(OBJS_FILE) \
+ gfx/style.o gfx/fig.o gfx/record.o gfx/cro.o gfx/diff.o gfx/gfx.o \
+ gfx/text.o gfx/misc.o gfx/pdftoc.o \
+ $(OBJS_MISC)
EEPLOT_OBJS = main/eeplot.o main/common.o version.o \
$(OBJS_KICAD) \
$(OBJS_FILE) \
@@ -78,11 +77,11 @@ include Makefile.c-common
.PHONY: test neo900 sch test testref png pngref pdf diff view newref
.PHONY: leak
-all:: $(NAME) eeplot eetest
+all:: eeshow eeplot eetest
-$(NAME): $(OBJS)
+eeshow: $(EESHOW_OBJS)
$(MAKE) -B version.o
- $(CC) -o $(NAME) $(OBJS) $(LDLIBS)
+ $(CC) -o $@ $(EESHOW_OBJS) $(LDLIBS)
eeplot: $(EEPLOT_OBJS)
$(MAKE) -B version.o
@@ -194,4 +193,4 @@ leak: $(NAME)
#----- Cleanup ----------------------------------------------------------------
spotless::
- rm -f eeplot eetest
+ rm -f eeshow eeplot eetest
diff --git a/main.c b/main/eeshow.c
index c59956b..18001d4 100644
--- a/main.c
+++ b/main/eeshow.c
@@ -1,5 +1,5 @@
/*
- * main.c - Visualize and convert Eeschema schematics
+ * main/eeshow.c - Visualize Eeschema schematics
*
* Written 2016 by Werner Almesberger
* Copyright 2016 by Werner Almesberger