Fix automake vala hacks to avoid redundant calls to valac

Previously, valac would be invoked for each .c source file. Now it's only
called once (for the main .vala file, creating all .c files in the process).

diff --git a/Makefile.am b/Makefile.am
index 1cc7454..f8eb85d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,7 @@ cinaest_VALASOURCES = \
        src/settings-dialog.vala \
        src/source-dialog.vala
 
-${cinaest_SOURCES}: ${cinaest_VALASOURCES}
+src/main.c: ${cinaest_VALASOURCES}
        ${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
 cinaest_VALAFLAGS = --vapidir ./vapi --pkg config \
@@ -92,7 +92,7 @@ libgoogle_plugin_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS}
 libgoogle_plugin_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS}
 libgoogle_plugin_la_LDFLAGS = -module
 
-${libgoogle_plugin_la_SOURCES}: ${libgoogle_plugin_la_VALASOURCES}
+src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
        ${VALAC} -C ${libgoogle_plugin_la_VALASOURCES} ${libgoogle_plugin_la_VALAFLAGS}
 
 libimdb_plugin_la_SOURCES = \
@@ -119,7 +119,7 @@ libimdb_plugin_la_CFLAGS = ${DBUS_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLI
 libimdb_plugin_la_LIBADD = ${DBUS_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
 libimdb_plugin_la_LDFLAGS = -module
 
-${libimdb_plugin_la_SOURCES}: ${libimdb_plugin_la_VALASOURCES}
+src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES}
        ${VALAC} -C ${libimdb_plugin_la_VALASOURCES} ${libimdb_plugin_la_VALAFLAGS}
 
 imdb_plaintext_downloader_SOURCES = \
@@ -141,7 +141,7 @@ imdb_plaintext_downloader_VALAFLAGS = --vapidir ./vapi \
 imdb_plaintext_downloader_CFLAGS = ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SQLITE3_CFLAGS}
 imdb_plaintext_downloader_LDADD = ${DBUS_LIBS} ${GIO_LIBS} ${SQLITE3_LIBS} -lz
 
-${imdb_plaintext_downloader_SOURCES}: ${imdb_plaintext_downloader_VALASOURCES}
+src/imdb/imdb-plaintext-downloader.c: ${imdb_plaintext_downloader_VALASOURCES}
        ${VALAC} -C ${imdb_plaintext_downloader_VALASOURCES} ${imdb_plaintext_downloader_VALAFLAGS}
 
 google_poster_downloader_SOURCES = \
@@ -159,12 +159,14 @@ google_poster_downloader_VALAFLAGS = --thread --vapidir ./vapi \
 google_poster_downloader_CFLAGS = ${DBUS_CFLAGS} ${GIO_CFLAGS} ${SOUP_CFLAGS}
 google_poster_downloader_LDADD = ${DBUS_LIBS} ${GIO_LIBS} ${SOUP_LIBS}
 
-${google_poster_downloader_SOURCES}: ${google_poster_downloader_VALASOURCES}
+src/poster/google-poster-downloader.c: ${google_poster_downloader_VALASOURCES}
        ${VALAC} -C ${google_poster_downloader_VALASOURCES} ${google_poster_downloader_VALAFLAGS}
 
-BUILT_SOURCES = \
+ACLOCAL_AMFLAGS = -Im4
+
+CLEANFILES = \
        ${cinaest_SOURCES} \
+       ${libgoogle_plugin_la_SOURCES} \
        ${libimdb_plugin_la_SOURCES} \
-       ${imdb_plaintext_downloader_SOURCES}
-
-CLEANFILES = ${BUILT_SOURCES}
+       ${imdb_plaintext_downloader_SOURCES} \
+       ${google_poster_downloader_SOURCES}