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>

1 files changed, 76 insertions, 286 deletions

diff --git a/Makefile b/Makefile
index e0689548d..0e15becd7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@ NAME = subsurface
 CAPITALIZED_NAME = Subsurface
 TARGET = $(NAME)
 
+include Configure.mk
 VERSION=3.1
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
+CXX=g++
+CXXFLAGS=-Wall -g $(CLCXXFLAGS) -DQT_NO_KEYWORDS
 INSTALL=install
-PKGCONFIG=pkg-config
-XML2CONFIG=xml2-config
-XSLCONFIG=xslt-config
 
 # these locations seem to work for SuSE and Fedora
 # prefix = $(HOME)
@@ -28,141 +28,86 @@ DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 XSLTFILES = xslt/*.xslt xslt/*.xsl
 
-VERSION_FILE = version.h
-# There's only one line in $(VERSION_FILE); use the shell builtin `read'
-STORED_VERSION_STRING = \
-	$(subst ",,$(shell [ ! -r $(VERSION_FILE) ] || \
-			   read ignore ignore v <$(VERSION_FILE) && echo $$v))
-#" workaround editor syntax highlighting quirk
-
-UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win|gnu|kfreebsd")
-GET_VERSION = ./scripts/get-version
-VERSION_STRING := $(shell [ -d .git ] && $(GET_VERSION) linux || \
-			echo "v$(VERSION)")
-# Mac Info.plist style with three numbers 1.2.3
-CFBUNDLEVERSION_STRING := $(shell [ -d .git ] && \
-				$(GET_VERSION) darwin $(VERSION_STRING) || \
-				echo "$(VERSION).0")
-# Windows .nsi style with four numbers 1.2.3.4
-PRODVERSION_STRING := $(shell [ -d .git ] && \
-				$(GET_VERSION) win $(VERSION_STRING) || \
-				echo "$(VERSION).0.0")
-
-# 'pretty' output (easy to spot warnings) by default
-# 'verbose' output (all the details) by calling with "make V=1"
-ifeq ($(V),1)
-	PRETTYECHO=true
-	COMPILE_PREFIX=
-else
-	PRETTYECHO=echo
-	COMPILE_PREFIX=@
+EXTRA_FLAGS =  $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
+	       $(LIBDIVECOMPUTERCFLAGS) \
+	       $(LIBSOUPCFLAGS) $(GCONF2CFLAGS)
+
+HEADERS = \
+	qt-ui/addcylinderdialog.h \
+	qt-ui/addweightsystemdialog.h \
+	qt-ui/divelistview.h \
+	qt-ui/maintab.h \
+	qt-ui/mainwindow.h \
+	qt-ui/models.h \
+	qt-ui/plotareascene.h \
+	qt-ui/starwidget.h \
+	qt-ui/modeldelegates.h \
+	qt-ui/profilegraphics.h \
+	qt-ui/globe.h
+
+
+SOURCES = \
+	deco.c \
+	device.c \
+	dive.c \
+	divelist.c \
+	download-dialog.c \
+	equipment.c \
+	file.c \
+	info.c \
+	main.c \
+	parse-xml.c \
+	prefs.c \
+	profile.c \
+	save-xml.c \
+	sha1.c \
+	statistics.c \
+	time.c \
+	qt-gui.cpp \
+	qt-ui/addcylinderdialog.cpp \
+	qt-ui/addweightsystemdialog.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 \
+	qt-ui/modeldelegates.cpp \
+	qt-ui/profilegraphics.cpp \
+	qt-ui/globe.cpp \
+	$(RESFILE)
+
+
+RESOURCES = $(NAME).qrc
+
+ifneq ($(SQLITE3FLAGS),)
+	EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS)
 endif
-
-# 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)
-	LIBGNUTLS = $(shell $(PKGCONFIG) --libs gnutls-extra) $(shell $(PKGCONFIG) --libs p11-kit-1)
-	RESFILE = packaging/windows/$(NAME).res
-	LDFLAGS += -Wl,-subsystem,windows
-	LIBWINSOCK = -lwsock32
-	TARGET = $(NAME).exe
-else ifeq ($(UNAME), darwin)
-	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
-	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
-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)
+ifneq ($(ZIPFLAGS),)
+       EXTRA_FLAGS += -DLIBZIP $(ZIPFLAGS)
 endif
+ifneq ($(strip $(LIBXSLT)),)
+       EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS)
 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)
-
-LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0)
-LIBDIVECOMPUTERCFLAGS = $(LIBDIVECOMPUTERINCLUDES)
-LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
-
-LIBXML2 = $(shell $(XML2CONFIG) --libs)
-LIBXSLT = $(shell $(XSLCONFIG) --libs)
-XML2CFLAGS = $(shell $(XML2CONFIG) --cflags)
-GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0)
-GTKCFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
-CFLAGS += $(shell $(XSLCONFIG) --cflags)
-OSMGPSMAPFLAGS += $(shell $(PKGCONFIG) --cflags osmgpsmap 2> /dev/null)
-LIBOSMGPSMAP += $(shell $(PKGCONFIG) --libs osmgpsmap 2> /dev/null)
+ifeq  ($(USE_GTK_UI),1)
 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)),)
-	ZIP = -DLIBZIP $(shell $(PKGCONFIG) --cflags libzip)
+       SOURCES += gps.c
+       EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS)
 endif
-
-LIBSQLITE3 = $(shell $(PKGCONFIG) --libs sqlite3 2> /dev/null)
-ifneq ($(strip $(LIBSQLITE3)),)
-	SQLITE3 = -DSQLITE3 $(shell $(PKGCONFIG) --cflags sqlite3)
 endif
 
 ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
-	LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0)
-	GCONF2CFLAGS =  $(shell $(PKGCONFIG) --cflags gconf-2.0)
-	OSSUPPORT = linux
-	OSSUPPORT_CFLAGS = $(GTKCFLAGS) $(GCONF2CFLAGS)
+	SOURCES += linux.c
 else ifeq ($(UNAME), darwin)
-	OSSUPPORT = macos
-	OSSUPPORT_CFLAGS = $(GTKCFLAGS)
+	SOURCES += macos.c
 	MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
 	MACOSXFILES = packaging/macosx
 	MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
 	INFOPLIST = $(MACOSXFILES)/Info.plist
 	INFOPLISTINPUT = $(INFOPLIST).in
-	EXTRALIBS = $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation -framework CoreServices
-	CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration)
-	LDFLAGS += -headerpad_max_install_names -sectcreate __TEXT __info_plist $(INFOPLIST)
-	GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler
+	LDFLAGS += -headerpad_max_install_names
 else
-	OSSUPPORT = windows
-	OSSUPPORT_CFLAGS = $(GTKCFLAGS)
+	SOURCES += windows.c
 	WINDOWSSTAGING = ./packaging/windows
 	WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
 	NSIINPUTFILE = $(WINDOWSSTAGING)/$(NAME).nsi.in
@@ -171,170 +116,15 @@ else
 	XSLTDIR = .\\xslt
 endif
 
-ifneq ($(strip $(LIBXSLT)),)
-	XSLT=-DXSLT='"$(XSLTDIR)"'
-endif
-
-LIBS = $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(LIBGNUTLS)
+LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
+	$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -lmarblewidget
 
 MSGLANGS=$(notdir $(wildcard po/*.po))
-MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/$(NAME).mo))
-
-GTKOBJS = info-gtk.o divelist-gtk.o planner-gtk.o statistics-gtk.o gtk-gui.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 \
-	statistics.o file.o device.o download-dialog.o prefs.o \
-	webservice.o sha1.o $(GPSOBJ) $(OSSUPPORT).o $(RESFILE) $(GTKOBJS)
-
-DEPS = $(wildcard .dep/*.dep)
-
-all: $(TARGET)
-
-$(TARGET): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST)
-	@$(PRETTYECHO) '    LINK' $(TARGET)
-	$(COMPILE_PREFIX)$(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
-
-gen_version_file:
-ifneq ($(STORED_VERSION_STRING),$(VERSION_STRING))
-	$(info updating $(VERSION_FILE) to $(VERSION_STRING))
-	@echo \#define VERSION_STRING \"$(VERSION_STRING)\" >$(VERSION_FILE)
-endif
-
-install: all
-	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) $(NAME) $(BINDIR)
-	$(INSTALL) -d -m 755 $(DESKTOPDIR)
-	$(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
-	$(INSTALL) -d -m 755 $(ICONDIR)
-	$(INSTALL) -m 644 $(ICONFILE) $(ICONDIR)
-	@-if test -z "$(DESTDIR)"; then \
-		$(gtk_update_icon_cache); \
-	fi
-	$(INSTALL) -d -m 755 $(MANDIR)
-	$(INSTALL) -m 644 $(MANFILES) $(MANDIR)
-	@-if test ! -z "$(XSLT)"; then \
-		$(INSTALL) -d -m 755 $(DATADIR)/$(NAME); \
-		$(INSTALL) -d -m 755 $(XSLTDIR); \
-		$(INSTALL) -m 644 $(XSLTFILES) $(XSLTDIR); \
-	fi
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d $(prefix)/$$LOC; \
-		$(INSTALL) -m 644 $$LOC/$(NAME).mo $(prefix)/$$LOC/$(NAME).mo; \
-	done
-
-
-install-macosx: all
-	$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
-	$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
-	$(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/$(NAME)-bin
-	$(INSTALL) $(MACOSXFILES)/$(NAME).sh $(MACOSXINSTALL)/Contents/MacOS/$(NAME)
-	$(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/
-	$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
-	$(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
-	$(INSTALL) $(MACOSXFILES)/$(CAPITALIZED_NAME).icns $(MACOSXINSTALL)/Contents/Resources/
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
-		$(INSTALL) $$LOC/$(NAME).mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/$(NAME).mo; \
-	done
-	@-if test ! -z "$(XSLT)"; then \
-		$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/xslt; \
-		$(INSTALL) -m 644 $(XSLTFILES) $(MACOSXINSTALL)/Contents/Resources/xslt/; \
-	fi
-
-
-create-macosx-bundle: all
-	$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources
-	$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/MacOS
-	$(INSTALL) $(NAME) $(MACOSXSTAGING)/Contents/MacOS/
-	$(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXSTAGING)/Contents/
-	$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXSTAGING)/Contents/
-	$(INSTALL) $(ICONFILE) $(MACOSXSTAGING)/Contents/Resources/
-	$(INSTALL) $(MACOSXFILES)/$(CAPITALIZED_NAME).icns $(MACOSXSTAGING)/Contents/Resources/
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \
-		$(INSTALL) $$LOC/$(NAME).mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/$(NAME).mo; \
-	done
-	@-if test ! -z "$(XSLT)"; then \
-		$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/xslt; \
-		$(INSTALL) -m 644 $(XSLTFILES) $(MACOSXSTAGING)/Contents/Resources/xslt/; \
-	fi
-	$(GTK_MAC_BUNDLER) packaging/macosx/$(NAME).bundle
-
-sign-macosx-bundle: all
-	codesign -s "3A8CE62A483083EDEA5581A61E770EC1FA8BECE8" /Applications/$(CAPITALIZED_NAME).app/Contents/MacOS/$(NAME)-bin
-
-install-cross-windows: all
-	$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/share/locale
-	for MSG in $(WINMSGDIRS); do\
-		$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$MSG;\
-		$(INSTALL) $(CROSS_PATH)/$$MSG/* $(WINDOWSSTAGING)/$$MSG;\
-	done
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$LOC; \
-		$(INSTALL) $$LOC/$(NAME).mo $(WINDOWSSTAGING)/$$LOC/$(NAME).mo; \
-	done
-
-create-windows-installer: all $(NSIFILE) install-cross-windows
-	$(MAKENSIS) $(NSIFILE)
-
-$(NSIFILE): $(NSIINPUTFILE)
-	$(shell cat $(NSIINPUTFILE) | sed -e 's/VERSIONTOKEN/$(VERSION_STRING)/;s/PRODVTOKEN/$(PRODVERSION_STRING)/' > $(NSIFILE))
-
-$(INFOPLIST): $(INFOPLISTINPUT)
-	$(shell cat $(INFOPLISTINPUT) | sed -e 's/CFBUNDLEVERSION_TOKEN/$(CFBUNDLEVERSION_STRING)/' > $(INFOPLIST))
-
-# Transifex merge the translations
-update-po-files:
-	tx pull -af
-
-push-pot:
-	xgettext -o po/$(NAME)-new.pot -s -k_ -kN_ --keyword=C_:1c,2  --add-comments="++GETTEXT" *.c
-	tx push -s
-
-EXTRA_FLAGS =	$(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
-		$(XSLT) $(ZIP) $(SQLITE3) $(LIBDIVECOMPUTERCFLAGS) \
-		$(LIBSOUPCFLAGS) $(OSMGPSMAPFLAGS) $(GCONF2CFLAGS)
-
-%.o: %.c
-	@$(PRETTYECHO) '    CC' $<
-	@mkdir -p .dep
-	$(COMPILE_PREFIX)$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
-
-share/locale/%.UTF-8/LC_MESSAGES/$(NAME).mo: po/%.po po/%.aliases
-	mkdir -p $(dir $@)
-	msgfmt -c -o $@ po/$*.po
-	@-if test -s po/$*.aliases; then \
-		for ALIAS in `cat po/$*.aliases`; do \
-			mkdir -p share/locale/$$ALIAS/LC_MESSAGES; \
-			cp $@ share/locale/$$ALIAS/LC_MESSAGES; \
-		done; \
-	fi
-
-satellite.png: satellite.svg
-	convert -transparent white -resize 11x16 -depth 8 $< $@
-
-# This should work, but it doesn't get the colors quite right - so I manually converted with Gimp
-#	convert -colorspace RGB -transparent white -resize 256x256 $(NAME)-icon.svg $(NAME)-icon.png
-#
-# The following creates the pixbuf data in .h files with the basename followed by '_pixmap'
-# as name of the data structure
-%.h: %.png
-	@$(PRETTYECHO) '    gdk-pixbuf-csource' $<
-	$(COMPILE_PREFIX)gdk-pixbuf-csource --struct --name `echo $* | sed 's/-/_/g'`_pixbuf $< > $@
-
-doc:
-	$(MAKE) -C Documentation doc
-
-clean:
-	rm -f $(OBJS) *~ $(NAME) $(NAME).exe po/*~ po/$(NAME)-new.pot \
-		$(VERSION_FILE)
-	rm -rf share .dep
 
-release:
-	@scripts/check-version -cr $(VERSION_STRING)
-	git archive --prefix $(CAPITALIZED_NAME)-$(VERSION_STRING)/ \
-		    --output $(CAPITALIZED_NAME)-$(VERSION_STRING).tgz \
-		    v$(VERSION_STRING)
+# Add files to the following variables if the auto-detection based on the
+# filename fails
+OBJS_NEEDING_MOC =
+OBJS_NEEDING_UIC =
+HEADERS_NEEDING_MOC =
 
--include $(DEPS)
+include Rules.mk