[latexila] Build fixes

[Sébastien Wilmet <swilmet src gnome org>]

commit 493fa2306039e3e9085c63a9a1e45d9e72f0a9f3
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Oct 26 14:28:47 2014 +0100

    Build fixes

 src/Makefile.am             |   24 ++++++++++++------------
 src/evince/Makefile.am      |    2 +-
 src/liblatexila/Makefile.am |    4 ++--
 src/ui/Makefile.am          |    2 ++
 tests/Makefile.am           |    9 +++++----
 5 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 73341af..1946bd3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,10 +64,11 @@ latexila_SOURCES =                          \
        $(vapidir)/menu_tool_action.vapi        \
        liblatexila/latexila.vapi
 
-latexila_CPPFLAGS =            \
-       -I$(top_srcdir)         \
-       -I$(srcdir)/gedit       \
-       -I$(srcdir)/liblatexila \
+latexila_CPPFLAGS =                    \
+       -I$(top_srcdir)                 \
+       -I$(srcdir)/gedit               \
+       -I$(srcdir)/liblatexila         \
+       -I$(builddir)/liblatexila       \
        -include config.h
 
 latexila_LDADD =                       \
@@ -80,15 +81,14 @@ MAINTAINERCLEANFILES =              \
 
 # GResource
 
-xml = latexila.gresource.xml
-res = latexila-resources.c
-$(res): $(xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(xml))
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(xml)
+latexila-resources.c: latexila.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/latexila.gresource.xml)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(srcdir)/latexila.gresource.xml
 
-latexila.$(OBJEXT): $(res)
+BUILT_SOURCES = latexila-resources.c
+nodist_latexila_SOURCES = $(BUILT_SOURCES)
 
-latexila_SOURCES += $(res)
-EXTRA_DIST = $(xml)
-MAINTAINERCLEANFILES += $(res)
+EXTRA_DIST = latexila.gresource.xml
+
+CLEANFILES = $(BUILT_SOURCES)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/evince/Makefile.am b/src/evince/Makefile.am
index b787b83..6435bc6 100644
--- a/src/evince/Makefile.am
+++ b/src/evince/Makefile.am
@@ -15,7 +15,7 @@ evince-gdbus-generated.c evince-gdbus-generated.h: evince-gdbus.xml Makefile
                        --interface-prefix=org.gnome.evince. \
                        --c-namespace=Evince \
                        --generate-c-code evince-gdbus-generated \
-                       evince-gdbus.xml
+                       $(srcdir)/evince-gdbus.xml
 
 EXTRA_DIST = evince-gdbus.xml
 
diff --git a/src/liblatexila/Makefile.am b/src/liblatexila/Makefile.am
index c0998e1..d438b57 100644
--- a/src/liblatexila/Makefile.am
+++ b/src/liblatexila/Makefile.am
@@ -44,8 +44,8 @@ liblatexila_built_sources =   \
        latexila-enum-types.c   \
        latexila-enum-types.h
 
-liblatexila_la_SOURCES =               \
-       $(liblatexila_headers)          \
+liblatexila_la_SOURCES =       \
+       $(liblatexila_headers)  \
        $(liblatexila_sources)
 
 nodist_liblatexila_la_SOURCES = $(liblatexila_built_sources)
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index f2fcf3b..c1251b9 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -4,4 +4,6 @@ dist_ui_DATA =                  \
        preferences_dialog.ui   \
        ui.xml
 
+EXTRA_DIST = latexila.adwaita.css
+
 -include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b690129..a4b850e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
 @GNOME_CODE_COVERAGE_RULES@
 
-AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/src/liblatexila \
-       -DSRCDIR=\""$(ABS_SRCDIR)"\"    \
+AM_CPPFLAGS =                                  \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/src/liblatexila         \
+       -I$(top_builddir)/src/liblatexila       \
+       -DSRCDIR=\""$(ABS_SRCDIR)"\"            \
        $(WARN_CFLAGS)
 
 LDADD = $(top_builddir)/src/liblatexila/liblatexila.la