1 files changed, 24 insertions, 42 deletions
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)