Fix build

diff --git a/configure.ac b/configure.ac
index 3a04131801e6aed094f2fd7a039d651c5a506775..a6df1c9000e597f2084c4a5e451db028b6d7be28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,7 @@ AC_CONFIG_FILES([Makefile
            compiler/Makefile
            vapi/Makefile
            valadate/Makefile
+           valadate/valadate.deps
            tests/Makefile
            doc/Makefile
            doc/manual/Makefile

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dea6eeada285cba1167912d3ab98b836945edd2f..fc42a8d18094bacf20dccd3603bf8b59ed981298 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,7 @@ test_programs = valadatetests valactests@PACKAGE_SUFFIX@
 # Valadate tests
 valadatetests_VALAFLAGS = \
        --vapidir $(top_srcdir)/valadate \
+       --vapidir $(top_srcdir)/vala \
        --vapidir $(top_srcdir)/vapi \
        --pkg valadate \
        --pkg gio-2.0 \
@@ -63,8 +64,8 @@ valadatetests_CFLAGS = \
 
 valactests@PACKAGE_SUFFIX@_VALAFLAGS = \
        --vapidir $(top_srcdir)/valadate \
+       --vapidir $(top_srcdir)/vala \
        --vapidir $(top_srcdir)/vapi \
-       --vapidir $(top_srcdir)/gee \
        --pkg valadate \
        --pkg config \
        --library valactests@PACKAGE_SUFFIX@ \

diff --git a/valadate/Makefile.am b/valadate/Makefile.am
index 0979ed658db2026bd7c195cbbc5b0aef6fe444db..04b34b3812dfc3887b12465349aa3c248834ff83 100644 (file)
--- a/valadate/Makefile.am
+++ b/valadate/Makefile.am
@@ -5,17 +5,14 @@ NULL =
 AM_CPPFLAGS = \
        $(COVERAGE_CFLAGS) \
        -I$(top_srcdir)/gee \
-       -I$(top_srcdir)/ccode \
        -I$(top_srcdir)/vala \
-       -I$(top_srcdir)/codegen \
        $(GLIB_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GMODULE_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       -g \
        $(NULL)
 
-BUILT_SOURCES = valadate.vala.stamp valadate.deps
+BUILT_SOURCES = valadate.vala.stamp
 
 lib_LTLIBRARIES = \
        libvaladate.la \
@@ -48,26 +45,25 @@ libvaladate_la_SOURCES = \
        $(libvaladate_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
-valadate.vapi valadate.vala.stamp: $(libvaladate_la_VALASOURCES)
+valadate.vapi valadate.h: valadate.vala.stamp
+valadate.vala.stamp: $(libvaladate_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(COVERAGE_VALAFLAGS) \
                $(VALAFLAGS) \
                -C \
-               -g \
+               --use-header \
+               -H valadate.h \
+               --library valadate \
+               --vapidir $(top_srcdir)/gee --pkg gee \
+               --vapidir $(top_srcdir)/vala --pkg vala \
                --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \
                --pkg gio-2.0 \
                --pkg gmodule-2.0 \
                --pkg libxml-2.0 \
                --pkg config \
-               --pkg libvala@PACKAGE_SUFFIX@ \
-               -H valadate.h \
-               --library valadate \
                $^
        @touch $@
 
-valadate.deps : valadate.deps.in
-       $(SED) -e 's,[@]PACKAGE_SUFFIX[@],$(PACKAGE_SUFFIX),g' < valadate.deps.in > valadate.deps
-
 libvaladate_la_LDFLAGS = -no-undefined
 
 libvaladate_la_LIBADD = \