aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-08 11:23:11 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-08 11:23:11 -0700
commita13d3172fa1cd66cd81b84f1c92f0c8e7de09375 (patch)
tree57618b94a497f3eee369f429a1f1a2426bc9aae1 /Makefile
parent91439f3aff9250da0ea423a560fec53db83fa4e7 (diff)
downloadsubsurface-a13d3172fa1cd66cd81b84f1c92f0c8e7de09375.tar.gz
Save default units using GConf
That seems to be the gtk2 way. Whatever. diveclog ends up defaulting to metric units, because we all know that's the right thing to do. However, I learnt to dive in the US, so I'm used to seeing psi and feet. So despite the sane defaults, I want diveclog to use the broken imperial units for me. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b47a531bb..a2062e6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ OBJS=main.o dive.o profile.o info.o divelist.o parse-xml.o save-xml.o
divelog: $(OBJS)
$(CC) $(LDFLAGS) -o divelog $(OBJS) \
`xml2-config --libs` \
- `pkg-config --libs gtk+-2.0 glib-2.0`
+ `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0`
parse-xml.o: parse-xml.c dive.h
$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags` parse-xml.c
@@ -18,7 +18,8 @@ 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` -c main.c
+ $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 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