diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-01-03 21:58:46 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-01-03 21:58:46 -0800 |
| commit | f93f578eca3a5c8cfed42fa6ddecba63b851e9ae (patch) | |
| tree | 64baf49864728e1c9c46d2920597e862832a3dae /Makefile | |
| parent | fc882f574febd5eb3387d33edc5f1f81ab93c0ea (diff) | |
| parent | 9cd18c43aaaccaa8ba0fbdf8e5a23ad6c7bbeb73 (diff) | |
| download | subsurface-f93f578eca3a5c8cfed42fa6ddecba63b851e9ae.tar.gz | |
Merge branch 'deco2'
Bringing in the first attempts to do our own deco calculations
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -130,7 +130,7 @@ LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALI MSGLANGS=$(notdir $(wildcard po/*po)) MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) -OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o \ +OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o uemis-downloader.o \ gtk-gui.o statistics.o file.o cochran.o $(OSSUPPORT).o $(RESFILE) @@ -244,6 +244,9 @@ divelist.o: divelist.c dive.h display.h divelist.h print.o: print.c dive.h display.h display-gtk.h $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c print.c +deco.o: deco.c dive.h + $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c deco.c + libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \ $(LIBDIVECOMPUTERCFLAGS) \ |