X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=20cbf8a578ba6f2d6673a27799f34c33106a7461;hb=d906c82f31c5406b6debe0df88cb49b916cd6ced;hp=638758cd93aa546a62dcf142ebdf45f0252c3deb;hpb=b1a1376f3baf78ceca49b47c7b39d58983f4f984;p=ext%2Fsubsurface.git diff --git a/Makefile b/Makefile index 638758c..20cbf8a 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread 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 \ - gtk-gui.o $(RESFILE) + gtk-gui.o statistics.o $(RESFILE) $(NAME): $(OBJS) $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) @@ -93,7 +93,9 @@ install: $(NAME) $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR) $(INSTALL) -d -m 755 $(ICONDIR) $(INSTALL) $(ICONFILE) $(ICONDIR) - $(gtk_update_icon_cache) + @-if test -z "$(DESTDIR)"; then \ + $(gtk_update_icon_cache); \ + fi $(INSTALL) -d -m 755 $(MANDIR) $(INSTALL) -m 644 $(MANFILES) $(MANDIR) @@ -134,6 +136,9 @@ info.o: info.c dive.h display.h display-gtk.h divelist.h equipment.o: equipment.c dive.h display.h divelist.h $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c equipment.c +statistics.o: statistics.c dive.h display.h divelist.h + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c statistics.c + divelist.o: divelist.c dive.h display.h divelist.h $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c divelist.c