[vala] build: Drop ccode dependency from libvalacore
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] build: Drop ccode dependency from libvalacore
- Date: Thu, 4 Aug 2011 07:54:33 +0000 (UTC)
commit ef31992ef167578a1a97a7b7f52cc0c974ebe0da
Author: Luca Bruno <lucabru src gnome org>
Date: Wed Aug 3 22:04:45 2011 +0200
build: Drop ccode dependency from libvalacore
codegen/Makefile.am | 1 +
vala/Makefile.am | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 1472c9e..2535a88 100644
--- 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 b20c832..936a2cb 100644
--- 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]