diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 14:44:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 14:44:27 -0700 |
| commit | c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0 (patch) | |
| tree | e2585459dafdcb544bfc4ff3e91e94a84fc72341 /Makefile | |
| parent | 8197d7f4d4702d18df5b2121b5e0126c61e1b7ea (diff) | |
| parent | 11becb87505b8cdf6fbf2f10941f87d394e49f80 (diff) | |
| download | subsurface-c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0.tar.gz | |
Merge branch 'open-files' of git://github.com/nathansamson/diveclog
* 'open-files' of git://github.com/nathansamson/diveclog:
Report errors when opening files
Make it possible to load multiple files at once.
Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -6,25 +6,25 @@ 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` + `pkg-config --libs gtk+-2.0 glib-2.0` parse-xml.o: parse-xml.c dive.h - $(CC) $(CFLAGS) -c `xml2-config --cflags` parse-xml.c + $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags` parse-xml.c save-xml.o: save-xml.c dive.h - $(CC) $(CFLAGS) -c save-xml.c + $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c save-xml.c dive.o: dive.c dive.h - $(CC) $(CFLAGS) -c dive.c + $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c dive.c -main.o: main.c dive.h display.h - $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.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 -profile.o: profile.c dive.h display.h - $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c profile.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 - $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c info.c +info.o: info.c dive.h display.h divelist.h + $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c info.c -divelist.o: divelist.c dive.h display.h - $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c divelist.c +divelist.o: divelist.c dive.h display.h divelist.h + $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0` -c divelist.c |