build: Drop ccode dependency from libvalacore

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 1472c9e02a77f213dc910010c053aa46bd6fca94..2535a88def83851f1b36db7814caed53c1d50efb 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -77,6 +77,7 @@ libvala@PACKAGE_SUFFIX@_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
        ../vala/libvalacore.la \
+       ../ccode/libvalaccode.la \
        $(NULL)
 
 EXTRA_DIST = $(libvala_la_VALASOURCES) codegen.vapi codegen.vala.stamp

diff --git a/vala/Makefile.am b/vala/Makefile.am
index b20c8328e9ad342035c6ebff59a36c0d469a902d..936a2cbe2d59cad443802c2c271e03d433833853 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -3,7 +3,6 @@ NULL =
 AM_CPPFLAGS = \
        $(COVERAGE_CFLAGS) \
        -I$(top_srcdir)/gee \
-       -I$(top_srcdir)/ccode \
        $(GLIB_CFLAGS) \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
        $(NULL)
@@ -176,14 +175,13 @@ valainclude_HEADERS = \
        $(NULL)
 
 vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
-       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --vapidir $(srcdir)/../ccode --pkg ccode --pkg config -H vala.h --library vala $^
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir $(srcdir)/../gee --pkg gee --pkg config -H vala.h --library vala $^
        @touch $@
 
 libvalacore_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
        ../gee/libgee.la \
-       ../ccode/libvalaccode.la \
        $(NULL)
 
 EXTRA_DIST = $(libvalacore_la_VALASOURCES) vala.vapi vala.vala.stamp