fsotdld: refactor automake configuration

15 files changed, 327 insertions, 619 deletions

diff --git a/fsotdld/src/bin/Makefile.am b/fsotdld/src/bin/Makefile.am
index fb64af92..40b34d2b 100644
--- a/fsotdld/src/bin/Makefile.am
+++ b/fsotdld/src/bin/Makefile.am
@@ -1,51 +1,33 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-INCLUDES = \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
+AM_CFLAGS = \
 	-include $(CONFIG_HEADER) \
 	-DG_LOG_DOMAIN=\"fsotdld\" \
 	$(NULL)
-
-BUILT_SOURCES = .vala.stamp
+AM_VALAFLAGS =
 
 sbin_PROGRAMS = fsotdld
 
-fsotdld_VALASOURCES = \
-	main.vala \
+fsotdld_SOURCES = main.vala
+fsotdld_VALAFLAGS = \
+	--vapidir vapi \
+	--pkg posix \
+	--pkg gio-2.0 \
+	--pkg fsoframework-2.0 \
+	--save-temps \
+	--basedir $(top_srcdir) \
 	$(NULL)
-
-fsotdld_SOURCES = \
-	$(fsotdld_VALASOURCES:.vala=.c) \
+fsotdld_CFLAGS = \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)
-
-$(BUILT_SOURCES): $(fsotdld_VALASOURCES)
-	$(VALAC) -C --vapidir vapi \
-				--pkg posix \
-				--pkg gio-2.0 \
-				--pkg fsoframework-2.0 \
-				--save-temps \
-				--basedir $(top_srcdir) $^
-	touch $@
-
 fsotdld_LDADD = \
 	$(FSO_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-EXTRA_DIST += \
-	$(fsotdld_VALASOURCES) \
-	$(fsotdld_SOURCES) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-CLEANFILES = \
-	$(fsotdld_SOURCES) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
 	Makefile.in \
 	$(NULL)
diff --git a/fsotdld/src/lib/Makefile.am b/fsotdld/src/lib/Makefile.am
index 20abd4d9..78ad43e3 100644
--- a/fsotdld/src/lib/Makefile.am
+++ b/fsotdld/src/lib/Makefile.am
@@ -1,15 +1,22 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.lib\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = libfsotdl.la
+libfsotdl_la_SOURCES = \
+	dbusinterfaces.vala \
+	gpsdata.vala \
+	gpsreceiver.vala \
+	gpschannel.vala \
+	locationprovider.vala \
+	source.vala \
+	$(NULL)
+libfsotdl_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/vapi \
 	--pkg glib-2.0 \
@@ -18,59 +25,20 @@ VALAC_ARGS = \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
 	--header fsotdl.h \
-	--library fsotdl-2.0
-
-BUILT_SOURCES = .vala.stamp fsotdl-2.0.vapi
-
-lib_LTLIBRARIES = \
-	libfsotdl.la
-	$(NULL)
-
-libfsotdl_la_VALASOURCES = \
-	dbusinterfaces.vala \
-	gpsdata.vala \
-	gpsreceiver.vala \
-	gpschannel.vala \
-	locationprovider.vala \
-	source.vala \
+	--library fsotdl-2.0 \
 	$(NULL)
-
-libfsotdl_la_SOURCES = \
-	$(BUILT_SOURCES) \
-	$(libfsotdl_la_VALASOURCES:.vala=.c) \
+libfsotdl_la_CFLAGS = \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)
-
-fsotdlincludedir = $(includedir)/fsoframework-2.0
-
-fsotdlinclude_HEADERS = fsotdl.h
-
-$(BUILT_SOURCES): $(libfsotdl_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-
 libfsotdl_la_LIBADD = \
 	$(FSO_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
+libfsotdl_la_LDFLAGS = -no-undefined -avoid-version
 
-vapidir = $(datadir)/vala/vapi
-
-dist_vapi_DATA = \
-	fsotdl-2.0.vapi \
-	fsotdl-2.0.deps \
-	$(NULL)
-
-EXTRA_DIST += \
-	$(libfsotdl_la_VALASOURCES) \
-	$(BUILT_SOURCES)
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(libfsotdl_la_SOURCES) \
-	$(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(libfsotdl_la_SOURCES) \
-	Makefile.in
+	Makefile.in \
+	$(NULL)
 
diff --git a/fsotdld/src/plugins/alarm/Makefile.am b/fsotdld/src/plugins/alarm/Makefile.am
index eabfa0ab..b99c30e6 100644
--- a/fsotdld/src/plugins/alarm/Makefile.am
+++ b/fsotdld/src/plugins/alarm/Makefile.am
@@ -1,56 +1,38 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(FSO_GLIB_CFLAGS) \
-	$(FSO_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.alarm\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_GLIB_LIBS) \
-	$(FSO_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la \
-	$(NULL)
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = alarm.la
+alarm_la_SOURCES = plugin.vala
+alarm_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/vapi \
 	--pkg glib-2.0 \
 	--pkg gio-2.0 \
 	--pkg gee-1.0 \
 	--pkg fsoframework-2.0 \
-	--pkg fso-glib-1.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = alarm.la
-alarm_la_SOURCES = plugin.c
-alarm_la_VALASOURCES = plugin.vala
-$(alarm_la_SOURCES): $(alarm_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-alarm_la_LIBADD = $(progs_ldadd)
-alarm_la_LDFLAGS = -no-undefined -module -avoid-version
-alarm_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(alarm_la_VALASOURCES) \
-	$(alarm_la_SOURCES) \
+	--pkg fso-glib-1.0 \
 	$(NULL)
-
-CLEANFILES = \
-	*.h \
-	$(alarm_la_SOURCES) \
+alarm_la_CFLAGS = \
+	$(FSO_GLIB_CFLAGS) \
+	$(FSO_CFLAGS) \
+	$(GEE_CFLAGS) \
 	$(NULL)
+alarm_la_LIBADD = \
+	$(FSO_GLIB_LIBS) \
+	$(FSO_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+alarm_la_LDFLAGS = -no-undefined -module -avoid-version
+# alarm_la_LIBTOOLFLAGS = --tag=disable-static
 
+CLEANFILES =
 MAINTAINERCLEANFILES = \
 	Makefile.in \
 	$(NULL)
diff --git a/fsotdld/src/plugins/contextmanager/Makefile.am b/fsotdld/src/plugins/contextmanager/Makefile.am
index 488a5141..01a898be 100644
--- a/fsotdld/src/plugins/contextmanager/Makefile.am
+++ b/fsotdld/src/plugins/contextmanager/Makefile.am
@@ -1,23 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.contextmanager\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = contextmanager.la
+contextmanager_la_SOURCES = plugin.vala
+contextmanager_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--vapidir $(top_srcdir)/vapi \
@@ -26,34 +18,24 @@ VALAC_ARGS = \
 	--pkg gio-hacks \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = contextmanager.la
-contextmanager_la_SOURCES = plugin.c
-contextmanager_la_VALASOURCES = plugin.vala
-$(contextmanager_la_SOURCES): $(contextmanager_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-contextmanager_la_LIBADD = $(progs_ldadd)
-contextmanager_la_LDFLAGS = -no-undefined -module -avoid-version
-contextmanager_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(contextmanager_la_VALASOURCES) \
-	$(contextmanager_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+contextmanager_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+contextmanager_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+contextmanager_la_LDFLAGS = -no-undefined -module -avoid-version
+# contextmanager_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_gps/Makefile.am b/fsotdld/src/plugins/provider_gps/Makefile.am
index 48de73da..7ac6e825 100644
--- a/fsotdld/src/plugins/provider_gps/Makefile.am
+++ b/fsotdld/src/plugins/provider_gps/Makefile.am
@@ -1,24 +1,15 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_gps\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_gps.la
+provider_gps_la_SOURCES = plugin.vala
+provider_gps_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -30,33 +21,23 @@ VALAC_ARGS = \
 	--pkg fsotransport-2.0 \
 	--pkg fsoresource-2.0 \
 	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_gps.la
-provider_gps_la_SOURCES = plugin.c
-provider_gps_la_VALASOURCES = plugin.vala
-$(provider_gps_la_SOURCES): $(provider_gps_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_gps_la_LIBADD = $(progs_ldadd)
-provider_gps_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_gps_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_gps_la_VALASOURCES) \
-	$(provider_gps_la_SOURCES) \
 	$(NULL)
+provider_gps_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+provider_gps_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+provider_gps_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_gps_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_gps_nmea/Makefile.am b/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
index 9832fa95..da9c6f23 100644
--- a/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
+++ b/fsotdld/src/plugins/provider_gps_nmea/Makefile.am
@@ -1,24 +1,14 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_gps_nmea\" \
 	$(NULL)
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_gps_nmea.la
+provider_gps_nmea_la_SOURCES = plugin.vala
+provider_gps_nmea_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -28,34 +18,24 @@ VALAC_ARGS = \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_gps_nmea.la
-provider_gps_nmea_la_SOURCES = plugin.c
-provider_gps_nmea_la_VALASOURCES = plugin.vala
-$(provider_gps_nmea_la_SOURCES): $(provider_gps_nmea_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_gps_nmea_la_LIBADD = $(progs_ldadd)
-provider_gps_nmea_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_gps_nmea_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_gps_nmea_la_VALASOURCES) \
-	$(provider_gps_nmea_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+provider_gps_nmea_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+provider_gps_nmea_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+provider_gps_nmea_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_gps_nmea_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_location_cellidwifi/Makefile.am b/fsotdld/src/plugins/provider_location_cellidwifi/Makefile.am
index 351ebfde..1892919a 100644
--- a/fsotdld/src/plugins/provider_location_cellidwifi/Makefile.am
+++ b/fsotdld/src/plugins/provider_location_cellidwifi/Makefile.am
@@ -1,30 +1,17 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
-	$(SOUP_CFLAGS) \
-	$(JSON_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_location_cellidwifi\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(SOUP_LIBS) \
-	$(JSON_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_location_cellidwifi.la
+provider_location_cellidwifi_la_SOURCES = plugin.vala
+provider_location_cellidwifi_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
-	--vapidir ../../lib \
+	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
 	--pkg glib-2.0 \
 	--pkg gio-2.0 \
@@ -35,34 +22,27 @@ VALAC_ARGS = \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
 	--pkg fsoresource-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_location_cellidwifi.la
-provider_location_cellidwifi_la_SOURCES = plugin.c
-provider_location_cellidwifi_la_VALASOURCES = plugin.vala
-$(provider_location_cellidwifi_la_SOURCES): $(provider_location_cellidwifi_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_location_cellidwifi_la_LIBADD = $(progs_ldadd)
-provider_location_cellidwifi_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_location_cellidwifi_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_location_cellidwifi_la_VALASOURCES) \
-	$(provider_location_cellidwifi_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+provider_location_cellidwifi_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(JSON_CFLAGS) \
+	$(NULL)
+provider_location_cellidwifi_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(SOUP_LIBS) \
+	$(JSON_CFLAGS) \
+	$(NULL)
+provider_location_cellidwifi_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_location_cellidwifi_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_location_dummy/Makefile.am b/fsotdld/src/plugins/provider_location_dummy/Makefile.am
index e0642bbd..8dd9ea2a 100644
--- a/fsotdld/src/plugins/provider_location_dummy/Makefile.am
+++ b/fsotdld/src/plugins/provider_location_dummy/Makefile.am
@@ -1,24 +1,15 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_location_dummy\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_location_dummy.la
+provider_location_dummy_la_SOURCES = plugin.vala
+provider_location_dummy_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -29,34 +20,24 @@ VALAC_ARGS = \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
 	--pkg fsoresource-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_location_dummy.la
-provider_location_dummy_la_SOURCES = plugin.c
-provider_location_dummy_la_VALASOURCES = plugin.vala
-$(provider_location_dummy_la_SOURCES): $(provider_location_dummy_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_location_dummy_la_LIBADD = $(progs_ldadd)
-provider_location_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_location_dummy_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_location_dummy_la_VALASOURCES) \
-	$(provider_location_dummy_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+provider_location_dummy_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+provider_location_dummy_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+provider_location_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_location_dummy_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am b/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
index 9d9e559f..42b28056 100644
--- a/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
+++ b/fsotdld/src/plugins/provider_location_freegeoip/Makefile.am
@@ -1,24 +1,15 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_location_freegeoip\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_location_freegeoip.la
+provider_location_freegeoip_la_SOURCES = plugin.vala
+provider_location_freegeoip_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -29,34 +20,24 @@ VALAC_ARGS = \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
 	--pkg fsoresource-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_location_freegeoip.la
-provider_location_freegeoip_la_SOURCES = plugin.c
-provider_location_freegeoip_la_VALASOURCES = plugin.vala
-$(provider_location_freegeoip_la_SOURCES): $(provider_location_freegeoip_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_location_freegeoip_la_LIBADD = $(progs_ldadd)
-provider_location_freegeoip_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_location_freegeoip_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_location_freegeoip_la_VALASOURCES) \
-	$(provider_location_freegeoip_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+provider_location_freegeoip_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+provider_location_freegeoip_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+provider_location_freegeoip_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_location_freegeoip_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/provider_location_gpsd/Makefile.am b/fsotdld/src/plugins/provider_location_gpsd/Makefile.am
index e8fb1bad..9bdb39c8 100644
--- a/fsotdld/src/plugins/provider_location_gpsd/Makefile.am
+++ b/fsotdld/src/plugins/provider_location_gpsd/Makefile.am
@@ -1,29 +1,18 @@
 include $(top_srcdir)/Makefile.decl
-
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
-	$(GPS_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.provider_location_gpsd\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(GPS_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = provider_location_gpsd.la
+provider_location_gpsd_la_SOURCES = plugin.vala
+provider_location_gpsd_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
-	--vapidir . \
+	--vapidir $(top_srcdir)/src/plugins/provider_location_gpsd \
 	--pkg posix \
 	--pkg glib-2.0 \
 	--pkg gio-2.0 \
@@ -34,33 +23,25 @@ VALAC_ARGS = \
 	--pkg fsotransport-2.0 \
 	--pkg fsoresource-2.0 \
 	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = provider_location_gpsd.la
-provider_location_gpsd_la_SOURCES = plugin.c
-provider_location_gpsd_la_VALASOURCES = plugin.vala
-$(provider_location_gpsd_la_SOURCES): $(provider_location_gpsd_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-provider_location_gpsd_la_LIBADD = $(progs_ldadd)
-provider_location_gpsd_la_LDFLAGS = -no-undefined -module -avoid-version
-provider_location_gpsd_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(provider_location_gpsd_la_VALASOURCES) \
-	$(provider_location_gpsd_la_SOURCES) \
 	$(NULL)
+provider_location_gpsd_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(GPS_CFLAGS) \
+	$(NULL)
+provider_location_gpsd_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(GPS_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la
+	$(NULL)
+provider_location_gpsd_la_LDFLAGS = -no-undefined -module -avoid-version
+# provider_location_gpsd_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/source_dummy/Makefile.am b/fsotdld/src/plugins/source_dummy/Makefile.am
index f296001d..df2a4fed 100644
--- a/fsotdld/src/plugins/source_dummy/Makefile.am
+++ b/fsotdld/src/plugins/source_dummy/Makefile.am
@@ -1,25 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_GLIB_CFLAGS) \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.source_dummy\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_GLIB_LIBS) \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = source_dummy.la
+source_dummy_la_SOURCES = plugin.vala
+source_dummy_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -29,34 +19,26 @@ VALAC_ARGS = \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = source_dummy.la
-source_dummy_la_SOURCES = plugin.c
-source_dummy_la_VALASOURCES = plugin.vala
-$(source_dummy_la_SOURCES): $(source_dummy_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-source_dummy_la_LIBADD = $(progs_ldadd)
-source_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
-source_dummy_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(source_dummy_la_VALASOURCES) \
-	$(source_dummy_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+source_dummy_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_GLIB_CFLAGS) \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+source_dummy_la_LIBADD = \
+	$(FSO_GLIB_LIBS) \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+source_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
+# source_dummy_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/source_gps/Makefile.am b/fsotdld/src/plugins/source_gps/Makefile.am
index 6128401f..b70deccc 100644
--- a/fsotdld/src/plugins/source_gps/Makefile.am
+++ b/fsotdld/src/plugins/source_gps/Makefile.am
@@ -1,25 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_GLIB_CFLAGS) \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.source_gps\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_GLIB_LIBS) \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = source_gps.la
+source_gps_la_SOURCES = plugin.vala
+source_gps_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -29,34 +19,26 @@ VALAC_ARGS = \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = source_gps.la
-source_gps_la_SOURCES = plugin.c
-source_gps_la_VALASOURCES = plugin.vala
-$(source_gps_la_SOURCES): $(source_gps_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-source_gps_la_LIBADD = $(progs_ldadd)
-source_gps_la_LDFLAGS = -no-undefined -module -avoid-version
-source_gps_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(source_gps_la_VALASOURCES) \
-	$(source_gps_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+source_gps_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_GLIB_CFLAGS) \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+source_gps_la_LIBADD = \
+	$(FSO_GLIB_LIBS) \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+source_gps_la_LDFLAGS = -no-undefined -module -avoid-version
+# source_gps_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/source_gsm/Makefile.am b/fsotdld/src/plugins/source_gsm/Makefile.am
index 88750e7c..e1f57384 100644
--- a/fsotdld/src/plugins/source_gsm/Makefile.am
+++ b/fsotdld/src/plugins/source_gsm/Makefile.am
@@ -1,25 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_GLIB_CFLAGS) \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.source_gsm\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_GLIB_LIBS) \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = source_gsm.la
+source_gsm_la_SOURCES = plugin.vala
+source_gsm_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -30,33 +20,25 @@ VALAC_ARGS = \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
 	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = source_gsm.la
-source_gsm_la_SOURCES = plugin.c
-source_gsm_la_VALASOURCES = plugin.vala
-$(source_gsm_la_SOURCES): $(source_gsm_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-source_gsm_la_LIBADD = $(progs_ldadd)
-source_gsm_la_LDFLAGS = -no-undefined -module -avoid-version
-source_gsm_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(source_gsm_la_VALASOURCES) \
-	$(source_gsm_la_SOURCES) \
 	$(NULL)
+source_gsm_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_GLIB_CFLAGS) \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+source_gsm_la_LIBADD = \
+	$(FSO_GLIB_LIBS) \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+source_gsm_la_LDFLAGS = -no-undefined -module -avoid-version
+# source_gsm_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/source_ntp/Makefile.am b/fsotdld/src/plugins/source_ntp/Makefile.am
index 216b364b..0a5ecde5 100644
--- a/fsotdld/src/plugins/source_ntp/Makefile.am
+++ b/fsotdld/src/plugins/source_ntp/Makefile.am
@@ -1,23 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.source_ntp\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = source_ntp.la
+source_ntp_la_SOURCES = plugin.vala
+source_ntp_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg posix \
@@ -28,34 +20,24 @@ VALAC_ARGS = \
 	--pkg fsobasics-2.0 \
 	--pkg fsoframework-2.0 \
 	--pkg fsotransport-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = source_ntp.la
-source_ntp_la_SOURCES = plugin.c
-source_ntp_la_VALASOURCES = plugin.vala
-$(source_ntp_la_SOURCES): $(source_ntp_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-source_ntp_la_LIBADD = $(progs_ldadd)
-source_ntp_la_LDFLAGS = -no-undefined -module -avoid-version
-source_ntp_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(source_ntp_la_VALASOURCES) \
-	$(source_ntp_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+source_ntp_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+source_ntp_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+source_ntp_la_LDFLAGS = -no-undefined -module -avoid-version
+# source_ntp_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)
diff --git a/fsotdld/src/plugins/sync_time/Makefile.am b/fsotdld/src/plugins/sync_time/Makefile.am
index 6d36fd9d..2e157713 100644
--- a/fsotdld/src/plugins/sync_time/Makefile.am
+++ b/fsotdld/src/plugins/sync_time/Makefile.am
@@ -1,23 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/lib \
-	$(FSO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GEE_CFLAGS) \
+AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"fsotdld.sync_time\" \
 	$(NULL)
+AM_VALAFLAGS =
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-progs_ldadd = \
-	$(FSO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GEE_LIBS) \
-	$(top_builddir)/src/lib/libfsotdl.la
-
-VALAC_ARGS = \
+modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
+modlibexec_LTLIBRARIES = sync_time.la
+sync_time_la_SOURCES = plugin.vala
+sync_time_la_VALAFLAGS = \
 	--basedir $(top_srcdir) \
 	--vapidir $(top_srcdir)/src/lib \
 	--pkg glib-2.0 \
@@ -25,34 +17,24 @@ VALAC_ARGS = \
 	--pkg gee-1.0 \
 	--pkg fso-glib-1.0 \
 	--pkg fsoframework-2.0 \
-	--pkg fsotdl-2.0
-
-#
-# plugin
-#
-modlibexecdir = $(libdir)/cornucopia/modules/fsotdl
-modlibexec_LTLIBRARIES = sync_time.la
-sync_time_la_SOURCES = plugin.c
-sync_time_la_VALASOURCES = plugin.vala
-$(sync_time_la_SOURCES): $(sync_time_la_VALASOURCES)
-	$(VALAC) -C $(VALAC_ARGS) $^
-	touch $@
-sync_time_la_LIBADD = $(progs_ldadd)
-sync_time_la_LDFLAGS = -no-undefined -module -avoid-version
-sync_time_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST += \
-	$(sync_time_la_VALASOURCES) \
-	$(sync_time_la_SOURCES) \
+	--pkg fsotdl-2.0 \
 	$(NULL)
+sync_time_la_CFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	$(FSO_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GEE_CFLAGS) \
+	$(NULL)
+sync_time_la_LIBADD = \
+	$(FSO_LIBS) \
+	$(GLIB_LIBS) \
+	$(GEE_LIBS) \
+	$(top_builddir)/src/lib/libfsotdl.la \
+	$(NULL)
+sync_time_la_LDFLAGS = -no-undefined -module -avoid-version
+# sync_time_la_LIBTOOLFLAGS = --tag=disable-static
 
-CLEANFILES = \
-    *.c \
-    *.h \
-    *.la \
-    *.lo \
-    $(NULL)
-
+CLEANFILES =
 MAINTAINERCLEANFILES = \
   Makefile.in \
   $(NULL)