Clean up the build system

Signed-off-by: Ikey Doherty <ikey@solus-project.com>

Author: ikeydoherty

Makefile.am

@@ -1,14 +1,32 @@
-AM_CFLAGS = $(GTK_CFLAGS)
 bin_PROGRAMS = bin/sshfs-connection-tool
-bin_sshfs_connection_tool_SOURCES = src/mainfile.c \
+
+bin_sshfs_connection_tool_SOURCES = \
+	src/mainfile.c \
 	src/application.c \
 	src/resources.c \
 	src/window.c \
 	include/application.h \
 	include/window.h
-bin_sshfs_connection_tool_LDADD = $(GTK_LIBS)
-BUILT_SOURCES = src/resources.c
-src_resources.c: builder/main.ui builder/menu.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES_) $(srcdir)/builder/test.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir)/builder --generate-source
-EXTRA_DIST = builder
+
+bin_sshfs_connection_tool_LDADD = \
+	$(GTK_LIBS)
+
+bin_sshfs_connection_tool_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(AM_CFLAGS)
+
+EXTRA_DIST = \
+	builder/main.ui \
+	builder/menu.ui \
+	builder/test.gresource.xml
+	
+src_resources = $(shell glib-compile-resources --sourcedir=$(top_srcdir)/builder --generate-dependencies $(top_srcdir)/builder/test.gresource.xml)
+
+BUILT_SOURCES = \
+	src-resources.c
+
+CLEANFILES = \
+	$(BUILT_SOURCES)
+
+src-resources.c: $(top_srcdir)/builder/test.gresource.xml $(src_resources)
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/builder --generate-source --c-name sshfs_connection_resources $<

autogen.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+srcdir=`dirname $0`
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+PKG_NAME="sshfs-connection-tool"
+prevdir="$PWD"
+cd "$srcdir"
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF;
+then
+  echo "*** No autoreconf found, please install it ***"
+  exit 1
+else
+  autoreconf --force --install || exit $?
+fi
+
+DEF_OPTS="--prefix=/usr --sysconfdir=/etc"
+
+cd "$prevdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" ${DEF_OPTS} "$@"

configure.ac

@@ -2,13 +2,20 @@ AC_PREREQ([2.69])
 AC_INIT([SSHFS Connection Tool], [0.0.1], [tobiaspg@member.fsf.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/mainfile.c])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror subdir-objects])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror subdir-objects -Wno-portability])
 
 AC_PROG_CC
 PKG_PROG_PKG_CONFIG
 
-PKG_CHECK_MODULES([GTK], [gtk+-3.0 glib-2.0])
-AM_PATH_GTK_3_0([3.10.0])
+m4_define([gtk_required_version], [3.10])
+
+PKG_CHECK_MODULES([GTK],
+                [
+                 gtk+-3.0 >= gtk_required_version,
+                 glib-2.0
+                ]
+)
+
 AC_CHECK_HEADER_STDBOOL
 
 AM_SILENT_RULES([yes])