mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/Configure.mk

184 lines
6.4 KiB
Makefile
Raw Normal View History

Trim Makefile, Configure.mk and Rules.mk Configure.mk contains the detection rules, whereas Rules.mk contains the rules to actually build Subsurface. This simplifies Makefile greatly, which is the file that should be actually modified during regular updates to the codebase. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 06:42:14 +00:00
# -*- Makefile -*-
# This file contains the detection rules
Introduce a cache of the configuration You may have noticed that running make is a little slow. Every time that it is loaded, it will try to detect everything again. So, instead, save the output and reload it the next time. This is implemented by adding a rule that (re-)creates the config.cache file, which is included by make. If the file doesn't exist yet, make will first run the rule which creates it, then reload itself. You can also cause it to reconfigure by running "make configure". Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:00:15 +00:00
all:
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
PKGCONFIG=pkg-config
XML2CONFIG=xml2-config
XSLCONFIG=xslt-config
Merge branch 'Qt' After the 3.1 release it is time to shift the focus on the Qt effort - and the best way to do this is to merge the changes in the Qt branch into master. Linus was extremely nice and did a merge for me. I decided to do my own merge instead (which by accident actually based on a different version of the Qt branch) and then used his merge to double check what I was doing. I resolved a few things differently but overall what we did was very much the same (and I say this with pride since Linus is a professional git merger) Here's his merge commit message: This is a rough and tumble merge of the Qt branch into 'master', trying to sort out the conflicts as best as I could. There were two major kinds of conflicts: - the Makefile changes, in particular the split of the single Makefile into Rules.mk and Configure.mk, along with the obvious Qt build changes themselves. Those changes conflicted with some of the updates done in mainline wrt "release" targets and some helper macros ($(NAME) etc). Resolved by largely taking the Qt branch versions, and then editing in the most obvious parts of the Makefile updates from mainline. NOTE! The script/get_version shell script was made to just fail silently on not finding a git repository, which avoided having to take some particularly ugly Makefile changes. - Various random updates in mainline to support things like dive tags. The conflicts were mainly to the gtk GUI parts, which obviously looked different afterwards. I fixed things up to look like the newer code, but since the gtk files themselves are actually dead in the Qt branch, this is largely irrelevant. NOTE! This does *NOT* introduce the equivalent Qt functionality. The fields are there in the code now, but there's no Qt UI for the whole dive tag stuff etc. This seems to compile for me (although I have to force "QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to work, but it is otherwise largely untested. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 05:01:41 +00:00
QMAKE=qmake
MOC=moc
UIC=uic
Do a better job finding Marble Google Sat files First try if Google Sat is already installed as a provider (and just use it if it is). Then use the executable path to make an educated guess where these files might be found as part of Subsurface. We now install the necessary directory tree under $(DESTDIR)/usr/share/subsurface/marbledata Still far from perfect - but this should work at least on Linux. MacOS will need a different modifier for the path and Windows I haven't even thought about, yet. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-29 19:59:38 +00:00
TAR=tar
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
Introduce a cache of the configuration You may have noticed that running make is a little slow. Every time that it is loaded, it will try to detect everything again. So, instead, save the output and reload it the next time. This is implemented by adding a rule that (re-)creates the config.cache file, which is included by make. If the file doesn't exist yet, make will first run the rule which creates it, then reload itself. You can also cause it to reconfigure by running "make configure". Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:00:15 +00:00
CONFIGFILE = config.cache
ifeq ($(CONFIGURING),1)
# Detect the target system
# Ask the compiler what OS it's producing files for
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win|gnu|kfreebsd")
# find libdivecomputer
# First deal with the cross compile environment and with Mac.
# For the native case, Linus doesn't want to trust pkg-config given
# how young libdivecomputer still is - so we check the typical
# subdirectories of /usr/local and /usr and then we give up. You can
# override by simply setting it here
#
ifeq ($(CC), i686-w64-mingw32-gcc)
# ok, we are cross building for Windows
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
RESFILE = packaging/windows/subsurface.res
LDFLAGS += -Wl,-subsystem,windows
LIBWINSOCK = -lwsock32
else ifeq ($(UNAME), darwin)
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
Detect libdivecomputer using pkg-config if possible If libdivecomputer is managed by pkg-config, we should query it for the compiler parameters on Linux also. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-19 05:35:48 +00:00
else ifeq ($(shell $(PKGCONFIG) --exists libdivecomputer; echo $$?),0)
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
else
libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
ifneq ($(LIBDCDEVEL),)
LIBDIVECOMPUTERDIR = ../libdivecomputer
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/src/.libs/libdivecomputer.a
else ifneq ($(strip $(libdc-local)),)
LIBDIVECOMPUTERDIR = /usr/local
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
else ifneq ($(strip $(libdc-local64)),)
LIBDIVECOMPUTERDIR = /usr/local
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
else ifneq ($(strip $(libdc-usr)),)
LIBDIVECOMPUTERDIR = /usr
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
else ifneq ($(strip $(libdc-usr64)),)
LIBDIVECOMPUTERDIR = /usr
LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include
LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
else
$(error Cannot find libdivecomputer - please edit Makefile)
endif
endif
# Libusb-1.0 is only required if libdivecomputer was built with it.
# And libdivecomputer is only built with it if libusb-1.0 is
# installed. So get libusb if it exists, but don't complain
# about it if it doesn't.
LIBUSB = $(shell $(PKGCONFIG) --libs libusb-1.0 2> /dev/null)
Search both qmake and qmake-qt4 Some Linux distributions do not ship a "qmake" binary, despite recommendations from the Qt Project. We need to cope with that, so we search for qmake-qt4 if qmake fails. We use "qmake -query QT_VERSION" instead of qmake -v because that is known to produce an error for Qt 3's qmake. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 21:23:39 +00:00
# Find qmake. Rules are:
# - use qmake if it is in $PATH
# [qmake -query QT_VERSION will fail if it's Qt 3's qmake]
# - if that fails, try qmake-qt4
# - if that fails, print an error
# We specifically do not search for qmake-qt5 since that is not supposed
# to exist.
QMAKE = $(shell { qmake -query QT_VERSION >/dev/null 2>&1 && echo qmake; } || \
{ qmake-qt4 -v >/dev/null 2>&1 && echo qmake-qt4; })
ifeq ($(strip $(QMAKE)),)
$(error Could not find qmake or qmake-qt4 in $$PATH or they failed)
endif
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
# Use qmake to find out which Qt version we are building for.
QT_VERSION_MAJOR = $(shell $(QMAKE) -query QT_VERSION | cut -d. -f1)
ifeq ($(QT_VERSION_MAJOR), 5)
Adds preliminary support for Marble Widget Adds preliminary support for marble widget, alongside with the dive list. my idea is to let the view stay there at the left of the dive list since we got a lot of unused space and a globe is something nice to have - so you can look around where did you dived, the dives near the one that's currectly selected, and so on. I'm not using OpenStreetMaps right now, but a good thing about marble is that it is skinnable - so for instance, a dive school could present a dive lesson using subsurface with a globe from the 1600, to make it feel like 'history'. This version will only compile to Qt4. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-17 11:14:10 +00:00
# QT_MODULES = Qt5Widgets Qt5Svg
# QT_CORE = Qt5Core
# QTBINDIR = $(shell $(QMAKE) -query QT_HOST_BINS)
# # Tool paths are not stored in .pc files in Qt 5.0
# MOC = $(QTBINDIR)/moc
# UIC = $(QTBINDIR)/uic
# RCC = $(QTBINDIR)/rcc
# if qmake is qt5, try to get the qt4 one.
QMAKE = { qmake-qt4 -v >/dev/null 2>&1 && echo qmake-qt4; }
#else
endif
ifeq ($(strip $(QMAKE)),)
$(error Could not find qmake or qmake-qt4 in $$PATH for the Qt4 version they failed)
endif
use QWebView to show the user manual Looks like the QTextBrowser can't render the manual correctly. Also, QWebView provides a better way to find contents on a webpage, which is an important feature for an user manual (to be implemented). Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
2013-08-22 19:20:47 +00:00
QT_MODULES = QtGui QtSvg QtNetwork QtWebKit
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
QT_CORE = QtCore
Get the name of moc,uic,rcc from the .pc files in Qt 4 Just in case some crazy distributions also rename the binaries. Renaming the binaries is not supported in Qt 5 and should never be done. Besides, the binary names are missing from Qt 5.0. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 21:23:40 +00:00
MOC = $(shell $(PKGCONFIG) --variable=moc_location QtCore)
UIC = $(shell $(PKGCONFIG) --variable=uic_location QtGui)
RCC = $(shell $(PKGCONFIG) --variable=rcc_location QtGui)
Adds preliminary support for Marble Widget Adds preliminary support for marble widget, alongside with the dive list. my idea is to let the view stay there at the left of the dive list since we got a lot of unused space and a globe is something nice to have - so you can look around where did you dived, the dives near the one that's currectly selected, and so on. I'm not using OpenStreetMaps right now, but a good thing about marble is that it is skinnable - so for instance, a dive school could present a dive lesson using subsurface with a globe from the 1600, to make it feel like 'history'. This version will only compile to Qt4. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-17 11:14:10 +00:00
#endif
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
Remove remainders of glib, gtk, libsoup, osmgpsmap from Configure.mk Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-06 17:48:33 +00:00
QTCXXFLAGS = $(shell $(PKGCONFIG) --cflags $(QT_MODULES))
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
LIBQT = $(shell $(PKGCONFIG) --libs $(QT_MODULES))
ifneq ($(filter reduce_relocations, $(shell $(PKGCONFIG) --variable qt_config $(QT_CORE))), )
QTCXXFLAGS += -fPIE
endif
Remove remainders of glib, gtk, libsoup, osmgpsmap from Configure.mk Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-06 17:48:33 +00:00
ifeq ($(UNAME), darwin)
Disable some MacOSX GTK dependencies Now it's actually possible to build the Qt variant on MacOSX with MacPorts and marble support. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-22 12:35:42 +00:00
LDFLAGS += -framework CoreFoundation -framework CoreServices
Create Rules.mk and Configure.mk by copying the Makefile This is to help Git know that the two files are the same content as the Makefile. The next commit will trim the files to what they need to be.
2013-04-23 06:28:29 +00:00
endif
LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERINCLUDES)
LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
LIBXML2 = $(shell $(XML2CONFIG) --libs)
LIBXSLT = $(shell $(XSLCONFIG) --libs)
XML2CFLAGS = $(shell $(XML2CONFIG) --cflags)
XSLCFLAGS = $(shell $(XSLCONFIG) --cflags)
LIBZIP = $(shell $(PKGCONFIG) --libs libzip 2> /dev/null)
ZIPFLAGS = $(strip $(shell $(PKGCONFIG) --cflags libzip 2> /dev/null))
LIBSQLITE3 = $(shell $(PKGCONFIG) --libs sqlite3 2> /dev/null)
SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3))
Introduce a cache of the configuration You may have noticed that running make is a little slow. Every time that it is loaded, it will try to detect everything again. So, instead, save the output and reload it the next time. This is implemented by adding a rule that (re-)creates the config.cache file, which is included by make. If the file doesn't exist yet, make will first run the rule which creates it, then reload itself. You can also cause it to reconfigure by running "make configure". Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:00:15 +00:00
Detect the presence of the missing Marble header by compiling it Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 18:40:52 +00:00
# Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed
# Check if it's present by trying to compile
MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE")
Add a variable for the Marble library name I need that for a Marble installed somewhere other than the linker's default search path. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 18:40:53 +00:00
MARBLELIBS = -lmarblewidget
Work around broken Marble on Debian This is a major hack. Debian appears to be missing a necessary header file for Marble to work correctly. We include this header file for now and hack the Configure process to recognize that we are on Debian and force using our local copy of the header file in that case. This may be needed on Ubuntu as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 16:44:54 +00:00
Introduce a cache of the configuration You may have noticed that running make is a little slow. Every time that it is loaded, it will try to detect everything again. So, instead, save the output and reload it the next time. This is implemented by adding a rule that (re-)creates the config.cache file, which is included by make. If the file doesn't exist yet, make will first run the rule which creates it, then reload itself. You can also cause it to reconfigure by running "make configure". Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:00:15 +00:00
# Write the configure file
all: configure
configure $(CONFIGURE): Configure.mk
@echo "\
Remove trailing spaces from config.cache file Things like «ifeq ($(UNAME), darwin)» would not trigger, since variables in the config.cache files had trailing spaces. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-23 19:54:24 +00:00
CONFIGURED = 1\\\
UNAME = $(UNAME)\\\
LIBDIVECOMPUTERDIR = $(LIBDIVECOMPUTERDIR)\\\
LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERCFLAGS)\\\
LIBDIVECOMPUTER = $(LIBDIVECOMPUTER)\\\
Fix building for Windows: cache the Windows-specific variables Otherwise, we won't link to winsock or set the subsystem correctly. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-25 00:02:49 +00:00
LIBWINSOCK = $(LIBWINSOCK)\\\
LDFLAGS = $(LDFLAGS)\\\
RESFILE = $(RESFILE)\\\
Remove trailing spaces from config.cache file Things like «ifeq ($(UNAME), darwin)» would not trigger, since variables in the config.cache files had trailing spaces. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-23 19:54:24 +00:00
LIBQT = $(LIBQT)\\\
QTCXXFLAGS = $(QTCXXFLAGS)\\\
MOC = $(MOC)\\\
UIC = $(UIC)\\\
RCC = $(RCC)\\\
LIBXML2 = $(LIBXML2)\\\
LIBXSLT = $(LIBXSLT)\\\
XML2CFLAGS = $(XML2CFLAGS)\\\
XSLCFLAGS = $(XSLCFLAGS)\\\
LIBZIP = $(LIBZIP)\\\
ZIPFLAGS = $(ZIPFLAGS)\\\
LIBSQLITE3 = $(LIBSQLITE3)\\\
SQLITE3FLAGS = $(SQLITE3FLAGS)\\\
Work around broken Marble on Debian This is a major hack. Debian appears to be missing a necessary header file for Marble to work correctly. We include this header file for now and hack the Configure process to recognize that we are on Debian and force using our local copy of the header file in that case. This may be needed on Ubuntu as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 16:44:54 +00:00
MARBLEFLAGS = $(MARBLEFLAGS)\\\
Add a variable for the Marble library name I need that for a Marble installed somewhere other than the linker's default search path. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 18:40:53 +00:00
MARBLELIBS = $(MARBLELIBS)\\\
Fix config.cache creation on a Mac Mac uses BSD sed by default, which doesn't support \n substition by default. Replacing sed with tr. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-23 19:24:01 +00:00
" | tr '\\' '\n' > $(CONFIGFILE)
Introduce a cache of the configuration You may have noticed that running make is a little slow. Every time that it is loaded, it will try to detect everything again. So, instead, save the output and reload it the next time. This is implemented by adding a rule that (re-)creates the config.cache file, which is included by make. If the file doesn't exist yet, make will first run the rule which creates it, then reload itself. You can also cause it to reconfigure by running "make configure". Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:00:15 +00:00
else
configure $(CONFIGFILE): Configure.mk
@test -e $(CONFIGFILE) && echo Reconfiguring.. || echo Configuring...
@$(MAKE) CONFIGURING=1 configure
@echo Done
-include $(CONFIGFILE)
endif
.PHONY: configure all
Reference in a new issue Copy permalink