diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2013-01-18 03:05:49 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-01-17 22:29:41 -0800 |
| commit | 592c23cd9c3b378fcd1ee85380431bb8acc75dfe (patch) | |
| tree | 12b20a81190f5c016d39a4e84ce19c75b7da60aa /Makefile | |
| parent | a5ee2b66e1cc9b1b7b0b7437517a30bee5b0054f (diff) | |
| download | subsurface-592c23cd9c3b378fcd1ee85380431bb8acc75dfe.tar.gz | |
Updated the Makefile to support libsoup and include webservice.[c|h]
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -96,6 +96,8 @@ ifneq ($(strip $(LIBOSMGPSMAP)),) GPSOBJ = gps.o CFLAGS += -DHAVE_OSM_GPS_MAP endif +LIBSOUPCFLAGS = $(shell $(PKGCONFIG) --cflags libsoup-2.4) +LIBSOUP = $(shell $(PKGCONFIG) --libs libsoup-2.4) LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null) ifneq ($(strip $(LIBZIP)),) @@ -131,7 +133,7 @@ ifneq ($(strip $(LIBXSLT)),) endif endif -LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm -lssl -lcrypto $(LIBOSMGPSMAP) +LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm -lssl -lcrypto $(LIBOSMGPSMAP) $(LIBSOUP) MSGLANGS=$(notdir $(wildcard po/*po)) MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) @@ -139,7 +141,7 @@ MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.m OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o planner.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 device.o download-dialog.o prefs.o \ - $(GPSOBJ) $(OSSUPPORT).o $(RESFILE) + webservice.o $(GPSOBJ) $(OSSUPPORT).o $(RESFILE) $(NAME): $(OBJS) $(MSGOBJS) $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) @@ -286,6 +288,9 @@ device.o: device.c device.h dive.h prefs.o: prefs.c dive.h pref.h $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c prefs.c +webservice.o: webservice.c webservice.h dive.h display-gtk.h + $(CC) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(LIBSOUPCFLAGS) -c webservice.c + $(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h $(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c |