mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 21:20:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/Makefile

140 lines
3.4 KiB
Makefile
Raw Normal View History

Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
NAME = subsurface
CAPITALIZED_NAME = Subsurface
Fix Windows cross build commit 59294029f3d1 ("Capitalize package name and add capitalized tar-ball prefix") had an unintended side effect: the cross build for Windows on Linux no longer worked (as it set NAME=subsurface.exe). Fixed this by introducing a TARGET variable that is derived from $(NAME). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-14 10:15:35 +00:00
TARGET = $(NAME)
Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
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
include Configure.mk
Bump Makefile version to 3.1 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-13 22:33:57 +00:00
VERSION=3.1
Add the version to the Makefile Not quite the same format as for the kernel, but I want to do the normal "edit the makefile before making a release" model that I'm used to. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-26 18:04:50 +00:00
Fix stupid mis-initialization of current sample .. nice compiler warning hidden by the crazy gcc pointer sign warnings that nobody wants to see (yes, we really do want to do 'strlen()' even on unsigned strings, don't complain, crazy bitch compiler). So this also makes our CFLAGS set -Wno-pointer-sign. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-30 21:36:34 +00:00
CC=gcc
Make subsurface compile with -DGSEAL_ENABLE This forces us to use the proper gtk accessor functions. It may not be worth it if people actually do the Qt conversion, but if we want to try gtk3 at some point, this might help. This all came about because I was trying to explain on G+ what an immense pain this all was to even figure out, if you don't actually know gtk at all. Google and the gtk migration guide are almost useless, and the gtk2 documentation itself actually uses the fields directly without any accessor functions in several places. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-27 21:40:54 +00:00
CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
Setup Makefile for Qt/C++ builds Setup the build variables for building with QtWidgets, and add rules for processing the Q_OBJECT macros with moc and generate widget code from .ui files with uic. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>
2013-04-01 09:25:15 +00:00
CXX=g++
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
CXXFLAGS=-Wall -g $(CLCXXFLAGS) $(MARBLEFLAGS)
Add cheesy "install" target It just puts the subsurface binary in $(HOME)/bin. .. and then the binary won't find the icon file, so this is really not enough of an install to get it really working, but whatever. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-23 03:59:10 +00:00
INSTALL=install
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
# these locations seem to work for SuSE and Fedora
# prefix = $(HOME)
use DESTDIR according to my understanding of GNU standards make DESRDIR a prefix of everything according my understanding of the GNU standards. This is also useful(/needed) for installing in Gentoo. Declare BINDIR for bin/program directory. Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-17 13:53:59 +00:00
prefix = $(DESTDIR)/usr
BINDIR = $(prefix)/bin
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
DATADIR = $(prefix)/share
Create and install the documentation too The default build will now create the HTML documentation (only the HTML one) and the install rule will install it. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-30 23:39:00 +00:00
DOCDIR = $(DATADIR)/doc/$(NAME)
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
DESKTOPDIR = $(DATADIR)/applications
ICONPATH = $(DATADIR)/icons/hicolor
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
ICONDIR = $(ICONPATH)/scalable/apps
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
MANDIR = $(DATADIR)/man/man1
Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
XSLTDIR = $(DATADIR)/$(NAME)/xslt
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
MARBLEDIR = marbledata/maps/earth/googlesat
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
Rename subsurface.svg to subsurface-icon.svg In preparation for a subsurface-icon.h, this should avoid confusion about whether "subsurface.h" is a core header file. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2013-02-02 11:19:28 +00:00
ICONFILE = $(NAME)-icon.svg
Have "make install" act more as expected for a desktop application I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 22:58:38 +00:00
DESKTOPFILE = $(NAME).desktop
Install manpage (and fix two white space issues) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-12 20:30:08 +00:00
MANFILES = $(NAME).1
Make sure .xsl files are installed xslt/commonTemplates.xsl was missing from the install targets Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-08 19:49:57 +00:00
XSLTFILES = xslt/*.xslt xslt/*.xsl
Fix stupid mis-initialization of current sample .. nice compiler warning hidden by the crazy gcc pointer sign warnings that nobody wants to see (yes, we really do want to do 'strlen()' even on unsigned strings, don't complain, crazy bitch compiler). So this also makes our CFLAGS set -Wno-pointer-sign. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-30 21:36:34 +00:00
Reorder the Makefile Create three sections: 1) the detection rules 2) the main rules, what we usually edit 3) the build rules, which we usually don't change Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:26:33 +00:00
EXTRA_FLAGS = $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
$(LIBDIVECOMPUTERCFLAGS) \
$(LIBSOUPCFLAGS) $(GCONF2CFLAGS)
Add a HEADERS variable to the Makefile Similar to the qmake variable of the same name, this lists (at least) the headers that may need moc to be run on. Adding more headers is not a problem. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:19:03 +00:00
HEADERS = \
qt-ui/divelistview.h \
qt-ui/maintab.h \
qt-ui/mainwindow.h \
qt-ui/models.h \
qt-ui/plotareascene.h \
qt-ui/starwidget.h \
Added support for showing the Stars on the DiveTable For the stars on the dive table I had to rework a bit my StarRating widget, because it used a pixmap for each widget that were created. Not it uses only 2 pixmaps: the active and inactive ones. A new file was created named modeldelegates(h, cpp) that should hold all delegates of the models. For the GTK / C folks, a 'Delegate' ia s way to bypass the default behavior of the view that's displaying the data. I also added the code to display the stars if no delegate is set ( good for debugging. ) Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-04-27 15:27:27 +00:00
qt-ui/modeldelegates.h \
Started the code for the Profile Plotting This small patch adds a new class - ProfileGraphicsView it's a QGraphicsView based class that will holds all graphics-items for the plotting. The setup is simple, just call ui->ListView->plot( dive ) ( that's already a ProfileGraphicsView and magic will happen. Since Im using a QGraphicsView , the size of the canvas doesn't matter and I'm fixing it at 0,0,100,100. when a resize is done, the resizeEvent will be called, fitting the scene's rectangle on the view. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-04 19:12:43 +00:00
qt-ui/profilegraphics.h \
Borrowed the KMessageWidget code to better show passive information. Borrowed the code from KMessageWidget from Aurelian Gateau, Kdelibs, to better show passive information and notifications. instead of a popup blowing in the user's face, a nice, animated and well designed widget will gracefully fade-in, show the notes, and fade out when not needed anymore. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-18 00:58:49 +00:00
qt-ui/globe.h \
qt-ui/kmessagewidget.h \
Skeleton code for a non-blocking UI thread for downloading dives from the DC This is the skeleton code for a non-blocking ui-thread It already creates the first-thread ( 'do not block the ui' ) and the second thread ('download from the dive computer') We can in the future merge both in the same place - I didn't want to do that now because the download function is written in the libdivecomputer.c code, and I cant just transform that to a QThread and use signals, so I used two threads for that. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-20 19:43:33 +00:00
qt-ui/downloadfromdivecomputer.h \
Added support for a preliminary Preferences Dialog Dirk asked me to try to make it more modern, so I used as a base, the Firefox preferences. currently it saves / loads the preferences, and also smits a signal 'preferencesChanged' that should be connected to anything that uses preferenes, via the PreferencesDialog::intance() object. In the future, I plan to make it have a signal / slot for each member that changes. I also moved the icons to a new folder this time, because the amount of icons is now more than just two, and it was becoming messy. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-24 18:19:48 +00:00
qt-ui/preferences.h \
Added a new widget 'MinMaxAvgWidget' Added a new widget, MinMaxAvgWidget, a simple widget that displays values in 'min, max, avg' fashion. it has a setMaximum, setAverage and setMinimum methods, that is userful for setting the minimum, maximum and average of stuff. Ah, it also shows the minimum, maximum and average of things. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-04 21:51:27 +00:00
qt-ui/simplewidgets.h \
Added initial support for download dive info from the subsurface web service. Added initial support for download dive info from subsurface web service, the current code only downloads and output the xml downloaded in the debug area. Now I need to parse things up and plug the unplugged stuff. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-06 13:33:15 +00:00
qt-ui/subsurfacewebservices.h \
Created a new dialog - Edit DiveComputer Created a new dialog, Edit Divecomputer, it will currently only lists the divecomputers that are used on the xml file. I used the same method that the gtk version used, but only 2 divecomputers got visualized in the dirk dive data. I'll assume that it's correct and will fix it in the next couple of commits. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-07 14:43:45 +00:00
qt-ui/divecomputermanagementdialog.h \
Add a HEADERS variable to the Makefile Similar to the qmake variable of the same name, this lists (at least) the headers that may need moc to be run on. Adding more headers is not a problem. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:19:03 +00:00
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
SOURCES = \
deco.c \
device.c \
dive.c \
divelist.c \
equipment.c \
file.c \
info.c \
main.c \
parse-xml.c \
profile.c \
save-xml.c \
sha1.c \
Start populating the maintab Dive Info widget Establish some useful helpers and use them when updating the values. One of the helpers (from statistics.c) puzzlingly doesn't link - so that's ifdefed out. Also had to re-arrange the settings reading code (it came too late) and to extract the expanding code of the top dive from the settings reading code (as it had no business being there to begin with). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-07 03:36:37 +00:00
statistics.c \
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
time.c \
Skeleton code for a non-blocking UI thread for downloading dives from the DC This is the skeleton code for a non-blocking ui-thread It already creates the first-thread ( 'do not block the ui' ) and the second thread ('download from the dive computer') We can in the future merge both in the same place - I didn't want to do that now because the download function is written in the libdivecomputer.c code, and I cant just transform that to a QThread and use signals, so I used two threads for that. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-20 19:43:33 +00:00
libdivecomputer.c \
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
qt-gui.cpp \
qt-ui/divelistview.cpp \
qt-ui/maintab.cpp \
qt-ui/mainwindow.cpp \
qt-ui/models.cpp \
qt-ui/plotareascene.cpp \
qt-ui/starwidget.cpp \
Added support for showing the Stars on the DiveTable For the stars on the dive table I had to rework a bit my StarRating widget, because it used a pixmap for each widget that were created. Not it uses only 2 pixmaps: the active and inactive ones. A new file was created named modeldelegates(h, cpp) that should hold all delegates of the models. For the GTK / C folks, a 'Delegate' ia s way to bypass the default behavior of the view that's displaying the data. I also added the code to display the stars if no delegate is set ( good for debugging. ) Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-04-27 15:27:27 +00:00
qt-ui/modeldelegates.cpp \
Started the code for the Profile Plotting This small patch adds a new class - ProfileGraphicsView it's a QGraphicsView based class that will holds all graphics-items for the plotting. The setup is simple, just call ui->ListView->plot( dive ) ( that's already a ProfileGraphicsView and magic will happen. Since Im using a QGraphicsView , the size of the canvas doesn't matter and I'm fixing it at 0,0,100,100. when a resize is done, the resizeEvent will be called, fitting the scene's rectangle on the view. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-04 19:12:43 +00:00
qt-ui/profilegraphics.cpp \
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-ui/globe.cpp \
Borrowed the KMessageWidget code to better show passive information. Borrowed the code from KMessageWidget from Aurelian Gateau, Kdelibs, to better show passive information and notifications. instead of a popup blowing in the user's face, a nice, animated and well designed widget will gracefully fade-in, show the notes, and fade out when not needed anymore. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-18 00:58:49 +00:00
qt-ui/kmessagewidget.cpp \
Skeleton code for a non-blocking UI thread for downloading dives from the DC This is the skeleton code for a non-blocking ui-thread It already creates the first-thread ( 'do not block the ui' ) and the second thread ('download from the dive computer') We can in the future merge both in the same place - I didn't want to do that now because the download function is written in the libdivecomputer.c code, and I cant just transform that to a QThread and use signals, so I used two threads for that. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-20 19:43:33 +00:00
qt-ui/downloadfromdivecomputer.cpp \
Added support for a preliminary Preferences Dialog Dirk asked me to try to make it more modern, so I used as a base, the Firefox preferences. currently it saves / loads the preferences, and also smits a signal 'preferencesChanged' that should be connected to anything that uses preferenes, via the PreferencesDialog::intance() object. In the future, I plan to make it have a signal / slot for each member that changes. I also moved the icons to a new folder this time, because the amount of icons is now more than just two, and it was becoming messy. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-05-24 18:19:48 +00:00
qt-ui/preferences.cpp \
Added a new widget 'MinMaxAvgWidget' Added a new widget, MinMaxAvgWidget, a simple widget that displays values in 'min, max, avg' fashion. it has a setMaximum, setAverage and setMinimum methods, that is userful for setting the minimum, maximum and average of stuff. Ah, it also shows the minimum, maximum and average of things. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-04 21:51:27 +00:00
qt-ui/simplewidgets.cpp \
Added initial support for download dive info from the subsurface web service. Added initial support for download dive info from subsurface web service, the current code only downloads and output the xml downloaded in the debug area. Now I need to parse things up and plug the unplugged stuff. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-06 13:33:15 +00:00
qt-ui/subsurfacewebservices.cpp \
Created a new dialog - Edit DiveComputer Created a new dialog, Edit Divecomputer, it will currently only lists the divecomputers that are used on the xml file. I used the same method that the gtk version used, but only 2 divecomputers got visualized in the dirk dive data. I'll assume that it's correct and will fix it in the next couple of commits. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2013-06-07 14:43:45 +00:00
qt-ui/divecomputermanagementdialog.cpp \
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
$(RESFILE)
Move the list of objects a little further up This also implies we don't need the OSSUPPORT variable anymore. We simply add to OBJS. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:13:10 +00:00
Add support for Qt resources in Subsurface Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-14 06:24:47 +00:00
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
RESOURCES = $(NAME).qrc
Add support for Qt resources in Subsurface Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-14 06:24:47 +00:00
Reorder the Makefile Create three sections: 1) the detection rules 2) the main rules, what we usually edit 3) the build rules, which we usually don't change Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:26:33 +00:00
ifneq ($(SQLITE3FLAGS),)
EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS)
Make silent make optional Backport of Thiago's commit 612a6ee2f793 ("Make the "silent mode" compilation be optional only.") from the Qt branch. Requested-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-13 16:05:15 +00:00
endif
Reorder the Makefile Create three sections: 1) the detection rules 2) the main rules, what we usually edit 3) the build rules, which we usually don't change Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:26:33 +00:00
ifneq ($(ZIPFLAGS),)
EXTRA_FLAGS += -DLIBZIP $(ZIPFLAGS)
Since we don't want configure, use gnumake to find libdivecomputer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-11 00:53:59 +00:00
endif
Reorder the Makefile Create three sections: 1) the detection rules 2) the main rules, what we usually edit 3) the build rules, which we usually don't change Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:26:33 +00:00
ifneq ($(strip $(LIBXSLT)),)
EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS)
Cleanup Makefile and make it work for cross compiling with MinGW Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-10-27 16:04:29 +00:00
endif
Remove the majority of the Gtk related code - rip all Gtk code from qt-gui.cpp - don't compile Gtk specific files - don't link against Gtk libraries - don't compile modules we don't use at all (yet) - use #if USE_GTK_UI on the remaining files to disable Gtk related parts - disable the non-functional Cochran support while I'm at it Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-03 18:04:51 +00:00
ifeq ($(USE_GTK_UI),1)
Hack Makefile, gtk-gui.c and divelist.c to allow building w/o osm-gps-map While we are waiting for an autotools generated Makefile, this should allow people to build that don't have osm-gps-map. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-17 18:59:43 +00:00
ifneq ($(strip $(LIBOSMGPSMAP)),)
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
SOURCES += gps.c
Reorder the Makefile Create three sections: 1) the detection rules 2) the main rules, what we usually edit 3) the build rules, which we usually don't change Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 06:26:33 +00:00
EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS)
Add "native" Suunto SDE zip file reading You need to have libzip-devel installed, and pkg-config needs to know about it for the build to pick up on it. On at least Fedora, a simple "yum install libzip-devel" will make things work, although you may need to force a rebuild of subsurface too (the "file.o" file in particular - the Makefile doesn't track system dependencies). Then, you can just do subsurface my-dives.SDE to read the data directly from the SDE file. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-01-27 01:43:33 +00:00
endif
Limited support for Suunto DM4 import Basic functionality is implemented but at least support for multiple cylinders is missing. Event/alarm support is only partial. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-03-05 05:10:39 +00:00
endif
Fix the build under Kfreebsd & HURD. Ensure that Kfreebsd and HURD are recognized as "like Linux" Signed-off-by: Sylvestre Ledru <sylvestre@debian.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-03-11 16:44:51 +00:00
ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
SOURCES += linux.c
Improve cross compile support and fix windows.c This should make the Makefile much more robust when cross compiling. The windows.c code is now compile tested but not functionally tested. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-25 06:32:10 +00:00
else ifeq ($(UNAME), darwin)
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
SOURCES += macos.c
Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
Improve Makefile for MacOS Some macs appear to need "-framework CoreFoundation" added to the linking step, others (which appear to have the exact same OS and tools installed), don't. But as it doesn't appeart to hurt, I unconditionally add this. Switched to using pkgconfig to find libdivecomputer on the Mac. Tried to clean up the Makefile a bit Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
2011-12-14 19:22:12 +00:00
MACOSXFILES = packaging/macosx
Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
Further automization of the Mac build process This improves the Plist.info and automates the version data that it uses utilizing the same git magic that the Makefile uses. It also makes the complete DMG creation a matter of simply running packaging/macosx/make-package.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-16 06:28:31 +00:00
INFOPLIST = $(MACOSXFILES)/Info.plist
INFOPLISTINPUT = $(INFOPLIST).in
Fix Mac build Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-03 19:53:45 +00:00
LDFLAGS += -headerpad_max_install_names
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
else
Add a SOURCES variable to the Makefile, replacing OBJS Instead of listing objects, let's list sources. This matches also what qmake and most other buildsystems do. The notable exception is the kernel. The reason that listing the sources will be interesting is because I'm about to add rules to create the dependency files. Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-13 16:27:55 +00:00
SOURCES += windows.c
Improved packaging for Windows This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:04:37 +00:00
WINDOWSSTAGING = ./packaging/windows
Redoing the Mac bundling With the right tools in place you can now create a bundle from the Makefile by calling "make create-macos-bundle" In the process of this I also moved the locale directory where we stage our .mo files to share/locale (which is much more logical). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 04:24:02 +00:00
WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
Capitalize package name and add capitalized tar-ball prefix Name and capitalized name of the project are set in the first two lines of the Makefile and referenced everywhere else through variabled instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-12 22:10:11 +00:00
NSIINPUTFILE = $(WINDOWSSTAGING)/$(NAME).nsi.in
NSIFILE = $(WINDOWSSTAGING)/$(NAME).nsi
Try to automate the version number used in the windows installer This adds a Makefile target to create the .nsi file from a template and to hopefully create the right strings to magically get the correct version strings in the Windows installer Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-24 23:58:35 +00:00
MAKENSIS = makensis
Add correct XSLT search path for Windows And report error if XSLT stylesheet not found Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-22 19:20:46 +00:00
XSLTDIR = .\\xslt
Split reading/writing preferences into OS specific files This adds tested code for Linux and Mac OS, implementing the api that Linus suggested. The Windows code was moved into its own file, but hasn't even been compile tested, yet. In order to have just one interface to set or get a preference value we encode TRUE as (void *) 1 and FALSE as NULL. This works consistently on all platforms and regardless of whether we have 32 or 64 bit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2011-11-24 06:56:57 +00:00
endif
Remove the majority of the Gtk related code - rip all Gtk code from qt-gui.cpp - don't compile Gtk specific files - don't link against Gtk libraries - don't compile modules we don't use at all (yet) - use #if USE_GTK_UI on the remaining files to disable Gtk related parts - disable the non-functional Cochran support while I'm at it Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-03 18:04:51 +00:00
LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
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
$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS)
Added a comment about libusb dependency in Makefile. Due to libdivecomputer's dependency, can be necessary to add libusb to pkg-config in order to compile, so I exported the pkg-config line in the subsurface target to LIBS variable, and added a comment about libusb. Signed-off-by: Riccardo Albertini <ssirowain@gmail.com>
2011-09-20 10:22:45 +00:00
Revert "Only include .po files that has a companion .aliases file" Commit 6044c22741 wrongly assumed that a disabled .po file had a companion .disabled file instead of an .aliases file. Running make after "tx pull -af" generated errors which I tried to fix. I shouldn't have, because the Makefile did the right thing. It warned about a missing .aliases file for a brand new translation. So, I'm reverting the commit and use "tx pull -f" instead the next time I need to test existing translations. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-03-14 09:24:14 +00:00
MSGLANGS=$(notdir $(wildcard po/*.po))
Auto-generate C file dependencies, and make the build more quiet This does some rough auto-generation of header file dependencies for all the *.c files, rather than our file-by-file incomplete hardcoded ones. It also stops showing the whole compile line, because it's ugly and distracting. Instead it just shows "CC file.c". If you care about the full thing, you still see them with "make -n". Only tested on Linux. It probably is missing some Windows or OSX-specific header includes. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-31 02:48:59 +00:00
Makefile: detect which files need moc and uic Add some magic rules to detect which files need to be processed by the moc or uic tools, as well as a way to manually specify exceptions. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-09 15:34:26 +00:00
# Add files to the following variables if the auto-detection based on the
# filename fails
OBJS_NEEDING_MOC =
OBJS_NEEDING_UIC =
HEADERS_NEEDING_MOC =
A lame start for a `make release' helper. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-08 22:55:44 +00:00
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
include Rules.mk
Reference in a new issue Copy permalink