mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated the Makefile to support libsoup and include webservice.[c|h]

Browse source 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-01-18 03:05:49 +02:00 • committed by Dirk Hohndel
parent a5ee2b66e1
commit 592c23cd9c
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -96,6 +96,8 @@ ifneq ($(strip $(LIBOSMGPSMAP)),)
GPSOBJ = gps.o GPSOBJ = gps.o
CFLAGS += -DHAVE_OSM_GPS_MAP CFLAGS += -DHAVE_OSM_GPS_MAP
endif endif
LIBSOUPCFLAGS = $(shell $(PKGCONFIG) --cflags libsoup-2.4)
LIBSOUP = $(shell $(PKGCONFIG) --libs libsoup-2.4)
LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null) LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null)
ifneq ($(strip $(LIBZIP)),) ifneq ($(strip $(LIBZIP)),)
@ -131,7 +133,7 @@ ifneq ($(strip $(LIBXSLT)),)
endif endif
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)) MSGLANGS=$(notdir $(wildcard po/*po))
MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) 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 \ 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 \ 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 \ 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) $(NAME): $(OBJS) $(MSGOBJS)
$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) $(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 prefs.o: prefs.c dive.h pref.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c prefs.c $(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 $(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h
$(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c $(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c