[gnome-calculator] Fixed autotools build after meson build



commit ddf0cbd2f283ce2feb4d2c1fa7a69f955a29c68a
Author: Robert Roth <robert roth off gmail com>
Date:   Fri Jan 26 21:11:38 2018 +0200

    Fixed autotools build after meson build

 lib/Makefile.am |    2 ++
 src/Makefile.am |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 03ba47e..82b328f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,9 @@ AM_CPPFLAGS = \
        $(LIBCALCULATOR_CFLAGS)
 
 libcalculator_la_SOURCES = \
+       $(top_builddir)/vapi/mpfr.vapi \
        mpfr-glue.vala \
+       $(top_builddir)/vapi/mpc.vapi \
        currency.vala \
        equation.vala \
        equation-lexer.vala \
diff --git a/src/Makefile.am b/src/Makefile.am
index 16f6e94..7c395f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ resources.c: $(resources_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-depe
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 gnome_calculator_SOURCES = \
-       config.vapi \
+       $(top_builddir)/vapi/config.vapi \
        gnome-calculator.vala \
        math-buttons.vala \
        math-converter.vala \
@@ -36,7 +36,7 @@ gnome_calculator_VALAFLAGS = \
        --pkg libxml-2.0 \
        --gresources $(resources_file) \
        $(top_builddir)/lib/libcalculator.vapi \
-       $(top_builddir)/lib/mpfr.vapi
+       $(top_builddir)/vapi/mpfr.vapi
 
 gnome_calculator_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -48,7 +48,7 @@ gnome_calculator_LDADD = \
 
 
 gcalccmd_SOURCES = \
-       config.vapi \
+       $(top_builddir)/vapi/config.vapi \
        gcalccmd.vala
 
 gcalccmd_VALAFLAGS = \
@@ -58,7 +58,7 @@ gcalccmd_VALAFLAGS = \
        --pkg gtksourceview-3.0 \
        --pkg libxml-2.0 \
        $(top_builddir)/lib/libcalculator.vapi \
-       $(top_builddir)/lib/mpfr.vapi
+       $(top_builddir)/vapi/mpfr.vapi
 
 gcalccmd_CPPFLAGS = \
        $(AM_CPPFLAGS) \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]