fsodevice: catch up with vala 0.7.x

7 files changed, 12 insertions, 52 deletions

diff --git a/fsodeviced/src/bin/Makefile.am b/fsodeviced/src/bin/Makefile.am
index b922f63c..280d1739 100644
--- a/fsodeviced/src/bin/Makefile.am
+++ b/fsodeviced/src/bin/Makefile.am
@@ -18,7 +18,6 @@ fsodeviced_VALASOURCES = \
 
 fsodeviced_SOURCES = \
 	$(fsodeviced_VALASOURCES:.vala=.c) \
-	$(fsodeviced_VALASOURCES:.vala=.h) \
 	$(NULL)
 
 $(BUILT_SOURCES): $(fsodeviced_VALASOURCES)
diff --git a/fsodeviced/src/lib/Makefile.am b/fsodeviced/src/lib/Makefile.am
index 37416d1e..934f8ad8 100644
--- a/fsodeviced/src/lib/Makefile.am
+++ b/fsodeviced/src/lib/Makefile.am
@@ -21,14 +21,11 @@ libfsodevice_la_VALASOURCES = \
 libfsodevice_la_SOURCES = \
 	$(BUILT_SOURCES) \
 	$(libfsodevice_la_VALASOURCES:.vala=.c) \
-	$(libfsodevice_la_VALASOURCES:.vala=.h) \
 	$(NULL)
 
-fsodeviceincludedir = $(includedir)/fsoframework-2.0/fsodevice
+fsodeviceincludedir = $(includedir)/fsoframework-2.0
 
-fsodeviceinclude_HEADERS = \
-	$(libfsodevice_la_VALASOURCES:.vala=.h) \
-	$(NULL)
+fsodeviceinclude_HEADERS = fsodevice.h
 
 $(BUILT_SOURCES): $(libfsodevice_la_VALASOURCES)
 	$(VALAC) -C --basedir $(top_srcdir) \
@@ -37,6 +34,7 @@ $(BUILT_SOURCES): $(libfsodevice_la_VALASOURCES)
 	            --pkg posixextra \
 	            --pkg glib-2.0 \
 	            --pkg gio-2.0 \
+	            --header fsodevice.h \
 	            --library fsodevice-2.0 $^
 	touch $@
 
@@ -49,6 +47,7 @@ vapidir = $(datadir)/vala/vapi
 
 dist_vapi_DATA = \
 	fsodevice-2.0.vapi \
+	fsodevice-2.0.deps \
 	$(NULL)
 
 EXTRA_DIST += \
diff --git a/fsodeviced/src/lib/fsodevice-2.0.deps b/fsodeviced/src/lib/fsodevice-2.0.deps
new file mode 100644
index 00000000..a2d9bba5
--- /dev/null
+++ b/fsodeviced/src/lib/fsodevice-2.0.deps
@@ -0,0 +1,2 @@
+fsoframework-2.0
+
diff --git a/fsodeviced/src/plugins/info/Makefile.am b/fsodeviced/src/plugins/info/Makefile.am
index a93f8009..251c10c7 100644
--- a/fsodeviced/src/plugins/info/Makefile.am
+++ b/fsodeviced/src/plugins/info/Makefile.am
@@ -16,17 +16,14 @@ VALAC_ARGS = \
 	--pkg glib-2.0 \
 	--pkg dbus-glib-1 \
 	--pkg gio-2.0 \
-	--pkg fsoframework-2.0 \
-	--pkg posix
-
-
+	--pkg fsoframework-2.0
 
 #
 # plugin
 #
 modlibexecdir = $(libdir)/cornucopia/modules/fsodevice
 modlibexec_LTLIBRARIES = info.la
-info_la_SOURCES = plugin.c plugin.h
+info_la_SOURCES = plugin.c
 info_la_VALASOURCES = plugin.vala
 $(info_la_SOURCES): $(info_la_VALASOURCES)
 	$(VALAC) -C $(VALAC_ARGS) $^
diff --git a/fsodeviced/src/plugins/kernel26_display/Makefile.am b/fsodeviced/src/plugins/kernel26_display/Makefile.am
index fc67dd62..f8de46de 100644
--- a/fsodeviced/src/plugins/kernel26_display/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_display/Makefile.am
@@ -15,15 +15,14 @@ VALAC_ARGS = \
 	--vapidir $(top_srcdir)/fsoframework \
 	--pkg glib-2.0 \
 	--pkg dbus-glib-1 \
-	--pkg fsoframework-2.0 \
-	--pkg posix
+	--pkg fsoframework-2.0
 
 #
 # plugin
 #
 modlibexecdir = $(libdir)/cornucopia/modules/fsodevice
 modlibexec_LTLIBRARIES = kernel26_display.la
-kernel26_display_la_SOURCES = plugin.c plugin.h
+kernel26_display_la_SOURCES = plugin.c
 kernel26_display_la_VALASOURCES = plugin.vala
 $(kernel26_display_la_SOURCES): $(kernel26_display_la_VALASOURCES)
 	$(VALAC) -C $(VALAC_ARGS) $^
diff --git a/fsodeviced/src/plugins/kernel26_leds/Makefile.am b/fsodeviced/src/plugins/kernel26_leds/Makefile.am
index d71d37f3..1ac441a8 100644
--- a/fsodeviced/src/plugins/kernel26_leds/Makefile.am
+++ b/fsodeviced/src/plugins/kernel26_leds/Makefile.am
@@ -23,7 +23,7 @@ VALAC_ARGS = \
 #
 modlibexecdir = $(libdir)/cornucopia/modules/fsodevice
 modlibexec_LTLIBRARIES = kernel26_leds.la
-kernel26_leds_la_SOURCES = plugin.c plugin.h
+kernel26_leds_la_SOURCES = plugin.c
 kernel26_leds_la_VALASOURCES = plugin.vala
 $(kernel26_leds_la_SOURCES): $(kernel26_leds_la_VALASOURCES)
 	$(VALAC) -C $(VALAC_ARGS) $^
diff --git a/fsodeviced/tests/Makefile.am b/fsodeviced/tests/Makefile.am
index 4e902e50..efbec9cf 100644
--- a/fsodeviced/tests/Makefile.am
+++ b/fsodeviced/tests/Makefile.am
@@ -13,49 +13,13 @@ progs_ldadd = $(DEPS_LIBS) ../fsodeviced/lib/libfsodeviced.la
 
 # TEST_PROGS += testsmartkeyfile
 # testsmartkeyfile_VALASOURCES = testsmartkeyfile.vala
-# testsmartkeyfile_SOURCES = testsmartkeyfile.c testsmartkeyfile.h
+# testsmartkeyfile_SOURCES = testsmartkeyfile.c
 # $(testsmartkeyfile_SOURCES): $(testsmartkeyfile_VALASOURCES)
 # 	$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/fsoframework --pkg glib-2.0 --pkg gio-2.0 --pkg fsoframework-2.0 $^
 # 	touch $@
 # testsmartkeyfile_LDADD = $(progs_ldadd)
 # EXTRA_DIST += $(testsmartkeyfile_VALASOURCES)
 # 
-# TEST_PROGS += testlogger
-# testlogger_VALASOURCES = testlogger.vala
-# testlogger_SOURCES = testlogger.c testlogger.h
-# $(testlogger_SOURCES): $(testlogger_VALASOURCES)
-# 	$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/fsoframework --pkg glib-2.0 --pkg gio-2.0 --pkg fsoframework-2.0 $^
-# 	touch $@
-# testlogger_LDADD = $(progs_ldadd)
-# EXTRA_DIST += $(testlogger_VALASOURCES)
-
-# TEST_PROGS += testarraylist
-# testarraylist_VALASOURCES = testarraylist.vala
-# testarraylist_SOURCES = testarraylist.c testarraylist.h
-# $(testarraylist_SOURCES): $(testarraylist_VALASOURCES)
-# 	$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/fsoframework --pkg fsoframework-2.0 $^
-# 	touch $@
-# testarraylist_LDADD = $(progs_ldadd)
-# EXTRA_DIST += $(testarraylist_VALASOURCES)
-#
-# TEST_PROGS += testhashmap
-# testhashmap_VALASOURCES = testhashmap.vala
-# testhashmap_SOURCES = testhashmap.c testhashmap.h
-# $(testhashmap_SOURCES): $(testhashmap_VALASOURCES)
-# 	$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/fsoframework --pkg fsoframework-2.0 $^
-# 	touch $@
-# testhashmap_LDADD = $(progs_ldadd)
-# EXTRA_DIST += $(testhashmap_VALASOURCES)
-#
-# TEST_PROGS += testhashset
-# testhashset_VALASOURCES = testhashset.vala
-# testhashset_SOURCES = testhashset.c testhashset.h
-# $(testhashset_SOURCES): $(testhashset_VALASOURCES)
-# 	$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/fsoframework --pkg fsoframework-2.0 $^
-# 	touch $@
-# testhashset_LDADD = $(progs_ldadd)
-# EXTRA_DIST += $(testhashset_VALASOURCES)
-#
 
 CLEANFILES = \
     $(TEST_PROGS) \