Remove the mandatory -fPIC from CXXFLAGS

This isn't necessary. There's code below adding -fPIE when necessary
only.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Add Qtr_ macros that uses gettext in a tr() compatible manner

This should wrap gettext nicely and replace the "_()" macros we use in C
code.

Also added comments to the top of all the new files.

Suggested-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Add common.h file

Oops

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Fixed the C++ code Style to conform the C style that was previously agreed upon.

Removed the use of operator<<() in a bunch of lines to do direct calls
this way the code will not scare non-c++ hearted people. :)
s

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Undoing the last Qtr_ hack

The Qtr_ hack isn't needed as in commit 720fc15b2dcd ("Introduce
QApplication") had already made sure that we are using gettext.

I didn't revert the two commits as I wanted to keep the added header
comments and fix the tooling in the Makefile as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Merge branch 'fixCppStyleToC' of https://github.com/tcanabrava/subsurface into Qt
Separate Gtk related code from core logic: info

Surprisingly straight forward, just a couple of places where we really mix
significant logic with UI code (for example setting the window title).

I had to move amount_selected from display-gtk.h to display.h - I guess
the number of dives that are selected is UI independent. But I wonder if
we still will track this as a global variable in a Qt UI (since the Gtk
selection logic is the main reason this existed in the first place).

Added a new info.h files for the necessary declarations.

This should make no difference to functionality.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Fix compilation: in C++, enums don't have operator++

To use ++, we need to declare the variable as int. But then we need to
cast to the enum type.

This is using C-style casts because this is still C-like code.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Create 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>
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>
Cache the Qt tools detected (and detect RCC)

Since we're caching the include flags and linker flags, we should also
cache the exact helper binaries we're running. This avoids getting
errors because the environment changed.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
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>
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>
Get the list of dependency includes from the SOURCES list

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Generate the C++ dependencies at configure-time

We use the -MG preprocessor option to the compiler to ask it to check
all #includes and tell us what's missing. Then our own rules will
generate the moc and uic files that the .cpp #include.

Unfortunately, our rules make uic generate output in qt-ui/ for
qt-ui/*.ui, while the compiler generates rules for no directory. We
need to fake it by forcing the generation.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Make the "silent mode" compilation be optional only.

If you run
   make V=1

Then we'll output the full command-line. It's useful for debugging
problems with the build.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Prettify the msgfmt and linking arguments

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Add support for Qt resources in Subsurface

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Don't hardcode the paths for mkdir: just get them from the target

The $(@D) (equivalent to $(dir $@)) tells us what the directory the
target is in. We could also have used the one for the source. They're
equivalent there.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Clean up the moc intermediates too in make clean

Signed-off-by: Thiago Macieira <thiago@macieira.org>