From 682135838ff313594c7f67fabd9be8f88a33883b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 20 Sep 2011 12:40:34 -0700 Subject: Separate out the UI from the program logic The following are UI toolkit specific: gtk-gui.c - overall layout, main window of the UI divelist.c - list of dives subsurface maintains equipment.c - equipment / tank information for each dive info.c - detailed dive info print.c - printing The rest is independent of the UI: main.c i - program frame dive.c i - creates and maintaines the internal dive list structure libdivecomputer.c uemis.c parse-xml.c save-xml.c - interface with dive computers and the XML files profile.c - creates the data for the profile and draws it using cairo This commit should contain NO functional changes, just moving code around and a couple of minor abstractions. Signed-off-by: Dirk Hohndel --- Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f12d0a0a..59363e2a1 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,8 @@ LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a LIBS = `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ - parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o + parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \ + gtk-gui.o subsurface: $(OBJS) $(CC) $(LDFLAGS) -o subsurface $(OBJS) \ @@ -26,13 +27,13 @@ dive.o: dive.c dive.h $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c dive.c main.o: main.c dive.h display.h divelist.h - $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \ + $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0 gconf-2.0` \ -c main.c profile.o: profile.c dive.h display.h divelist.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c profile.c -info.o: info.c dive.h display.h divelist.h +info.o: info.c dive.h display.h display-gtk.h divelist.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c info.c equipment.o: equipment.c dive.h display.h divelist.h @@ -41,13 +42,18 @@ equipment.o: equipment.c dive.h display.h divelist.h divelist.o: divelist.c dive.h display.h divelist.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c divelist.c -print.o: print.c dive.h display.h +print.o: print.c dive.h display.h display-gtk.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c print.c -libdivecomputer.o: libdivecomputer.c dive.h display.h +libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` \ -I$(LIBDIVECOMPUTERINCLUDES) \ -c libdivecomputer.c +gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h + $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \ + -I$(LIBDIVECOMPUTERINCLUDES) \ + -c gtk-gui.c + uemis.o: uemis.c uemis.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c uemis.c -- cgit v1.2.3-70-g09d2