fsosystemd: restructure autoconf/automake configuration to be ready for a release

3 files changed, 92 insertions, 93 deletions

diff --git a/fsosystemd/configure.ac b/fsosystemd/configure.ac
index 9c2d0122..f822cd10 100644
--- a/fsosystemd/configure.ac
+++ b/fsosystemd/configure.ac
@@ -1,31 +1,61 @@
-AC_INIT([fsosystemd], [0.10.0], [smartphones-userland@linuxtogo.org], [fsosystemd])
+m4_define([fsosystemd_released], [0])
+m4_define([fsosystemd_base_version], [0.10.0])
+m4_define([fsosystemd_maybe_gitrev], m4_if(fsosystemd_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
+m4_define([fsosystemd_version], m4_if(fsosystemd_released, [1], [fsosystemd_base_version], [fsosystemd_base_version-fsosystemd_maybe_gitrev]))
+
+AC_INIT([fsosystemd], fsosystemd_version, [smartphones-userland@linuxtogo.org], [fsosystemd])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_GNU_SOURCE
-#AC_DISABLE_STATIC
+AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-
-VALA_REQUIRED=0.14.2
-AC_PATH_PROG(VALAC, valac, valac)
-AC_SUBST(VALAC)
-m4_ifdef([AM_PROG_VALAC], [AM_PROG_VALAC([$VALA_REQUIRED])])
+PKG_PROG_PKG_CONFIG([0.21])
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+#########################################################################################
+# Vala building options -- allows tarball builds without installing vala
+#########################################################################################
+
+VALA_REQUIRED=0.14.2
+
+AC_ARG_ENABLE([vala], AS_HELP_STRING([--enable-vala],[Enable building from Vala sources]),
+              [enable_vala=$enableval], [enable_vala=no])
+
+# Force Vala for non-release builds
+m4_if(fsosystem_released, [1], [],
+      [
+        enable_vala=yes
+        echo "Vala compiler required for non-release builds; requiring Vala..."
+      ])
+
+if test "x$enable_vala" = "xyes" ; then
+    AM_PROG_VALAC([$VALA_REQUIRED])
+    if test "x$VALAC" = "x" ; then
+        AC_MSG_ERROR([Vala requested but valac is not installed])
+    fi
+fi
+
+AM_CONDITIONAL([HAVE_VALA], [test "x$enable_vala" = "xyes"])
+
+#########################################################################################
+# Check for various dependencies
+#########################################################################################
+
 GLIB_REQUIRED=2.26.0
 FSO_REQUIRED=0.10.0
 GEE_REQUIRED=0.5.0
 
-##############################################################################
-# glib and friends
-
 PKG_CHECK_MODULES(GLIB,
   glib-2.0 >= $GLIB_REQUIRED
   gobject-2.0 >= $GLIB_REQUIRED
@@ -33,9 +63,6 @@ PKG_CHECK_MODULES(GLIB,
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-##############################################################################
-# FSO
-
 PKG_CHECK_MODULES(FSO,
 	fsobasics-2.0 >= $FSO_REQUIRED
 	fsoframework-2.0 >= $FSO_REQUIRED
@@ -43,25 +70,25 @@ PKG_CHECK_MODULES(FSO,
 AC_SUBST(FSO_CFLAGS)
 AC_SUBST(FSO_LIBS)
 
-##############################################################################
-# gee
 PKG_CHECK_MODULES(GEE,
   gee-1.0 >= $GEE_REQUIRED)
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)
 
-##############################################################################
+#########################################################################################
 # check for debugging
+#########################################################################################
 
 AC_ARG_ENABLE(debug,
   [  --enable-debug            Enable debug build (default=disabled)],
-  [debug=$enableval],
-  [debug="no"])
-AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"])
-
-###############################################################################
+  [enable_debug=$enableval],
+  [enable_debug="no"])
+AM_CONDITIONAL( [WANT_DEBUG], [test x"$enable_debug" = x"yes"])
 
+#########################################################################################
 # output
+#########################################################################################
+
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
@@ -73,7 +100,10 @@ AC_CONFIG_FILES([
 ])
 AC_OUTPUT
 
+#########################################################################################
 # info
+#########################################################################################
+
 echo
 echo "------------------------------------------------------------------------"
 echo "$PACKAGE_NAME $PACKAGE_VERSION"
@@ -81,7 +111,11 @@ echo "------------------------------------------------------------------------"
 echo
 echo "Configuration Options:"
 echo
-echo "  debug build.............: $debug"
+echo "  Vala....................: $enable_vala"
+echo
+echo "  Vala Compiler...........: ${VALAC}"
+echo
+echo "  debug build.............: $enable_debug"
 echo
 echo "  prefix..................: $prefix"
 echo
diff --git a/fsosystemd/src/bin/Makefile.am b/fsosystemd/src/bin/Makefile.am
index 140ac96b..025f28a2 100644
--- a/fsosystemd/src/bin/Makefile.am
+++ b/fsosystemd/src/bin/Makefile.am
@@ -2,51 +2,34 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-INCLUDES = \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
+AM_CPPFLAGS = \
 	-include $(CONFIG_HEADER) \
 	-DG_LOG_DOMAIN=\"fsosystemd\" \
 	$(NULL)
 
-BUILT_SOURCES = .vala.stamp
+AM_VALAFLAGS = \
+	$(NULL)
+
+if WANT_DEBUG
+AM_VALAFLAGS += -g -D DEBUG
+AM_CPPFLAGS += -g -ggdb
+endif
 
 sbin_PROGRAMS = fsosystemd
 
-fsosystemd_VALASOURCES = \
-	main.vala \
+fsosystemd_SOURCES = main.vala
+fsosystemd_VALAFLAGS = \
+	--vapidir $(top_srcdir)/vapi \
+	--pkg posix \
+	--pkg gio-2.0 \
+	--pkg fsoframework-2.0 \
+	--basedir $(top_srcdir) \
 	$(NULL)
-
-fsosystemd_SOURCES = \
-	$(fsosystemd_VALASOURCES:.vala=.c) \
+fsosystemd_CPPFLAGS = \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)
-
-$(BUILT_SOURCES): $(fsosystemd_VALASOURCES)
-	$(VALAC) -C --vapidir vapi \
-				--pkg posix \
-				--pkg gio-2.0 \
-				--pkg fsoframework-2.0 \
-				--save-temps \
-				--basedir $(top_srcdir) $^
-	touch $@
-
 fsosystemd_LDADD = \
 	$(FSO_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
-
-EXTRA_DIST += \
-	$(fsosystemd_VALASOURCES) \
-	$(fsosystemd_SOURCES) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-CLEANFILES = \
-	*.c \
-	*.h \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-MAINTAINERCLEANFILES = \
-	Makefile.in \
-	$(NULL)
diff --git a/fsosystemd/src/plugins/kernel26_firmwareloader/Makefile.am b/fsosystemd/src/plugins/kernel26_firmwareloader/Makefile.am
index c74de614..aa02e9f8 100644
--- a/fsosystemd/src/plugins/kernel26_firmwareloader/Makefile.am
+++ b/fsosystemd/src/plugins/kernel26_firmwareloader/Makefile.am
@@ -4,18 +4,27 @@ NULL =
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
+	-DG_LOG_DOMAIN=\"fsosystem.test\" \
+	$(NULL)
+
+modlibexecdir = $(libdir)/cornucopia/modules/fsosystem
+modlibexec_LTLIBRARIES = kernel26_firmwareloader.la
+
+kernel26_firmwareloader_la_SOURCES = \
+	plugin.vala \
+	$(NULL)
+
+kernel26_firmwareloader_la_CFLAGS = \
 	$(FSO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\"fsosystem.kernel26_firmwareloader\" \
 	$(NULL)
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
+kernel26_firmwareloader_la_LIBADD = \
 	$(FSO_LIBS) \
 	$(GLIB_LIBS)
+	$(NULL)
 
-VALAC_ARGS = \
+kernel26_firmwareloader_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--vapidir $(top_srcdir)/vapi \
@@ -23,34 +32,7 @@ VALAC_ARGS = \
 	--pkg glib-2.0 \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0
-
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsosystem
-modlibexec_LTLIBRARIES = kernel26_firmwareloader.la
-kernel26_firmwareloader_la_SOURCES = plugin.c
-kernel26_firmwareloader_la_VALASOURCES = plugin.vala
-$(kernel26_firmwareloader_la_SOURCES): $(kernel26_firmwareloader_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-kernel26_firmwareloader_la_LIBADD = $(progs_ldadd)
-kernel26_firmwareloader_la_LDFLAGS = -no-undefined -module -avoid-version
-kernel26_firmwareloader_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(kernel26_firmwareloader_la_VALASOURCES) \
-	$(kernel26_firmwareloader_la_SOURCES) \
 	$(NULL)
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
-MAINTAINERCLEANFILES = \
-  Makefile.in \
-  $(NULL)
+kernel26_firmwareloader_la_LDFLAGS = -no-undefined -module -avoid-version
+# kernel26_firmwareloader_la_LIBTOOLFLAGS = --tag=disable-static