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>

1 files changed, 2 insertions, 290 deletions

diff --git a/Configure.mk b/Configure.mk
index e882a353d..f9b9e0674 100644
--- a/Configure.mk
+++ b/Configure.mk
@@ -1,12 +1,6 @@
-VERSION=3.0.2
+# -*- Makefile -*-
+# This file contains the detection rules
 
-CC=gcc
-CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
-CXX=g++
-CXXFLAGS=-Wall -g $(CLCFLAGS) -DQT_NO_KEYWORDS
-INSTALL=install
-
-# This are the detection rules
 PKGCONFIG=pkg-config
 XML2CONFIG=xml2-config
 XSLCONFIG=xslt-config
@@ -116,285 +110,3 @@ ZIPFLAGS = $(strip $(shell $(PKGCONFIG) --cflags libzip 2> /dev/null))
 
 LIBSQLITE3 = $(shell $(PKGCONFIG) --libs sqlite3 2> /dev/null)
 SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3))
-
-# These are the main rules
-
-# these locations seem to work for SuSE and Fedora
-# prefix = $(HOME)
-prefix = $(DESTDIR)/usr
-BINDIR = $(prefix)/bin
-DATADIR = $(prefix)/share
-DESKTOPDIR = $(DATADIR)/applications
-ICONPATH = $(DATADIR)/icons/hicolor
-ICONDIR = $(ICONPATH)/scalable/apps
-MANDIR = $(DATADIR)/man/man1
-XSLTDIR = $(DATADIR)/subsurface/xslt
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
-
-NAME = subsurface
-ICONFILE = $(NAME)-icon.svg
-DESKTOPFILE = $(NAME).desktop
-MANFILES = $(NAME).1
-XSLTFILES = xslt/*.xslt
-
-EXTRA_FLAGS =  $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
-	       $(LIBDIVECOMPUTERCFLAGS) \
-	       $(LIBSOUPCFLAGS) $(GCONF2CFLAGS)
-
-QTOBJS = qt-ui/maintab.o  qt-ui/mainwindow.o  qt-ui/plotareascene.o qt-ui/divelistview.o \
-	qt-ui/addcylinderdialog.o qt-ui/models.o qt-ui/starwidget.o
-
-GTKOBJS = info-gtk.o divelist-gtk.o planner-gtk.o statistics-gtk.o
-
-OBJS =	main.o dive.o time.o profile.o info.o equipment.o divelist.o divelist-gtk.o deco.o \
-	planner.o planner-gtk.o \
-	parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o uemis-downloader.o \
-	qt-gui.o statistics.o file.o cochran.o device.o download-dialog.o prefs.o \
-	webservice.o sha1.o $(RESFILE) $(QTOBJS) $(GTKOBJS)
-
-ifneq ($(SQLITE3FLAGS),)
-	EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS)
-endif
-ifneq ($(ZIPFLAGS),)
-       EXTRA_FLAGS += -DLIBZIP $(ZIPFLAGS)
-endif
-ifneq ($(strip $(LIBXSLT)),)
-       EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS)
-endif
-ifneq ($(strip $(LIBOSMGPSMAP)),)
-       OBJS += gps.o
-       EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS)
-endif
-
-ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
-	OBJS += linux.o
-else ifeq ($(UNAME), darwin)
-	OBJS += macos.o
-	MACOSXINSTALL = /Applications/Subsurface.app
-	MACOSXFILES = packaging/macosx
-	MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
-	INFOPLIST = $(MACOSXFILES)/Info.plist
-	INFOPLISTINPUT = $(INFOPLIST).in
-	LDFLAGS += -headerpad_max_install_names -sectcreate __TEXT __info_plist $(INFOPLIST)
-else
-	OBSJ += windows.o
-	WINDOWSSTAGING = ./packaging/windows
-	WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
-	NSIINPUTFILE = $(WINDOWSSTAGING)/subsurface.nsi.in
-	NSIFILE = $(WINDOWSSTAGING)/subsurface.nsi
-	MAKENSIS = makensis
-	XSLTDIR = .\\xslt
-endif
-
-LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
-	$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK)
-
-MSGLANGS=$(notdir $(wildcard po/*.po))
-
-# Add files to the following variables if the auto-detection based on the
-# filename fails
-OBJS_NEEDING_MOC =
-OBJS_NEEDING_UIC =
-HEADERS_NEEDING_MOC =
-
-# These are the generic rules for building
-
-# Rules for building and creating the version file
-
-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
-
-GET_VERSION = ./scripts/get-version
-VERSION_STRING := $(shell $(GET_VERSION) linux || echo "v$(VERSION)")
-# Mac Info.plist style with three numbers 1.2.3
-CFBUNDLEVERSION_STRING := $(shell $(GET_VERSION) darwin $(VERSION_STRING) || \
-	echo "$(VERSION).0")
-# Windows .nsi style with four numbers 1.2.3.4
-PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
-	echo "$(VERSION).0.0")
-
-MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo))
-
-# Add the objects for the header files which define QObject subclasses
-HEADERS_NEEDING_MOC += $(shell grep -l -s 'Q_OBJECT' $(OBJS:.o=.h))
-MOC_OBJS = $(HEADERS_NEEDING_MOC:.h=.moc.o)
-
-ALL_OBJS = $(OBJS) $(MOC_OBJS)
-
-DEPS = $(wildcard .dep/*.dep)
-
-all: $(NAME)
-
-$(NAME): gen_version_file $(ALL_OBJS) $(MSGOBJS) $(INFOPLIST)
-	$(CXX) $(LDFLAGS) -o $(NAME) $(ALL_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)/subsurface; \
-		$(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/subsurface.mo $(prefix)/$$LOC/subsurface.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)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
-		$(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.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)/Subsurface.icns $(MACOSXSTAGING)/Contents/Resources/
-	for LOC in $(wildcard share/locale/*/LC_MESSAGES); do \
-		$(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \
-		$(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.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/subsurface.bundle
-
-sign-macosx-bundle: all
-	codesign -s "3A8CE62A483083EDEA5581A61E770EC1FA8BECE8" /Applications/Subsurface.app/Contents/MacOS/subsurface-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/subsurface.mo $(WINDOWSSTAGING)/$$LOC/subsurface.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:
-	xgettext -o po/subsurface-new.pot -s -k_ -kN_ -ktr --keyword=C_:1c,2  --add-comments="++GETTEXT" *.c qt-ui/*.cpp
-	tx push -s
-	tx pull -af
-
-MOCFLAGS = $(filter -I%, $(CXXFLAGS) $(EXTRA_FLAGS)) $(filter -D%, $(CXXFLAGS) $(EXTRA_FLAGS))
-
-%.o: %.c
-	@echo '    CC' $<
-	@mkdir -p .dep .dep/qt-ui
-	@$(CC) $(CFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
-
-%.o: %.cpp
-	@echo '    CXX' $<
-	@mkdir -p .dep .dep/qt-ui
-	@$(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) -MD -MF .dep/$@.dep -c -o $@ $<
-
-# Detect which files require the moc or uic tools to be run
-CPP_NEEDING_MOC = $(shell grep -l -s '^\#include \".*\.moc\"' $(OBJS:.o=.cpp))
-OBJS_NEEDING_MOC += $(CPP_NEEDING_MOC:.cpp=.o)
-
-CPP_NEEDING_UIC = $(shell grep -l -s '^\#include \"ui_.*\.h\"' $(OBJS:.o=.cpp))
-OBJS_NEEDING_UIC += $(CPP_NEEDING_UIC:.cpp=.o)
-
-# This rule is for running the moc on QObject subclasses defined in the .h
-# files.
-%.moc.cpp: %.h
-	@echo '    MOC' $<
-	@$(MOC) $(MOCFLAGS) $< -o $@
-
-# This rule is for running the moc on QObject subclasses defined in the .cpp
-# files; remember to #include "<file>.moc" at the end of the .cpp file, or
-# you'll get linker errors ("undefined vtable for...")
-%.moc: %.cpp
-	@echo '    MOC' $<
-	@$(MOC) -i $(MOCFLAGS) $< -o $@
-
-# This creates the ui headers.
-ui_%.h: %.ui
-	@echo '    UIC' $<
-	@$(UIC) $< -o $@
-
-$(OBJS_NEEDING_MOC): %.o: %.moc
-$(OBJS_NEEDING_UIC): qt-ui/%.o: qt-ui/ui_%.h
-
-share/locale/%.UTF-8/LC_MESSAGES/subsurface.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 subsurface-icon.svg subsurface-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
-	@echo '    gdk-pixbuf-csource' $<
-	@gdk-pixbuf-csource --struct --name `echo $* | sed 's/-/_/g'`_pixbuf $< > $@
-
-doc:
-	$(MAKE) -C Documentation doc
-
-clean:
-	rm -f $(ALL_OBJS) *~ $(NAME) $(NAME).exe po/*~ po/subsurface-new.pot \
-		$(VERSION_FILE) qt-ui/*.moc qt-ui/ui_*.h
-	rm -rf share .dep
-
--include $(DEPS)