Commit ec85900a authored by Jürg Billeter's avatar Jürg Billeter Committed by Jürg Billeter

move code generator to new gobject directory update

2007-05-03  Jürg Billeter  <j@bitron.ch>

	* gobject/valacodegenerator.vala: move code generator to new gobject
	  directory
	* configure.ac, Makefile.am, vala/Makefile.am, gobject/Makefile.am,
	  compiler/Makefile.am, vapi/Makefile.am: update

svn path=/trunk/; revision=305
parent 7a65d693
2007-05-03 Jürg Billeter <j@bitron.ch>
* gobject/valacodegenerator.vala: move code generator to new gobject
directory
* configure.ac, Makefile.am, vala/Makefile.am, gobject/Makefile.am,
compiler/Makefile.am, vapi/Makefile.am: update
2007-05-03 Jürg Billeter <j@bitron.ch>
* vapi/glib-2.0.vala: GSList fixes and GIConv, patch by Michael Lawrence
......
......@@ -10,6 +10,7 @@ endif
SUBDIRS = \
ccode \
vala \
gobject \
compiler \
vapi \
tests \
......@@ -20,6 +21,7 @@ SUBDIRS = \
DIST_SUBDIRS = \
ccode \
vala \
gobject \
compiler \
vapi \
tests \
......
......@@ -18,7 +18,7 @@ valac_SOURCES = \
$(NULL)
valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --pkg config $^
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
touch $@
valac_CPPFLAGS = \
......@@ -27,7 +27,7 @@ valac_CPPFLAGS = \
valac_LDADD = \
$(GLIB_LIBS) \
../vala/libvala.la \
../gobject/libvala.la \
$(NULL)
EXTRA_DIST = valac.vala.stamp
......@@ -39,6 +39,7 @@ AC_CONFIG_FILES([Makefile
vala-1.0.pc
ccode/Makefile
vala/Makefile
gobject/Makefile
compiler/Makefile
vapi/Makefile
tests/Makefile
......
NULL =
INCLUDES = \
$(GLIB_CFLAGS) \
$(NULL)
BUILT_SOURCES = gobject.vala.stamp
lib_LTLIBRARIES = \
libvala.la
$(NULL)
libvala_la_SOURCES = \
gobject.vala.stamp \
valacodegenerator.c \
valacodegenerator.h \
valacodegenerator.vala \
$(NULL)
gobjectincludedir = $(includedir)/vala-1.0/gobject
gobjectinclude_HEADERS = \
valacodegenerator.h \
$(NULL)
gobject.vala gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --library gobject $^
touch $@
libvala_la_LIBADD = \
$(GLIB_LIBS) \
../vala/libvalacore.la \
$(NULL)
EXTRA_DIST = gobject.vala gobject.vala.stamp
......@@ -3162,7 +3162,7 @@ public class Vala.CodeGenerator : CodeVisitor {
}
if (array_expr is ArrayCreationExpression) {
var size = ((ArrayCreationExpression) array_expr).get_sizes ();
List<weak Expression> size = ((ArrayCreationExpression) array_expr).get_sizes ();
var length_expr = (Expression) size.nth_data (dim - 1);
return (CCodeExpression) length_expr.ccodenode;
} else if (array_expr.symbol_reference != null) {
......
......@@ -7,11 +7,11 @@ INCLUDES = \
BUILT_SOURCES = parser.h vala.vala.stamp
AM_YFLAGS = -d
lib_LTLIBRARIES = \
libvala.la
noinst_LTLIBRARIES = \
libvalacore.la
$(NULL)
libvala_la_SOURCES = \
libvalacore_la_SOURCES = \
parser.y \
scanner.l \
vala.h \
......@@ -76,9 +76,6 @@ libvala_la_SOURCES = \
valacodecontext.c \
valacodecontext.h \
valacodecontext.vala \
valacodegenerator.c \
valacodegenerator.h \
valacodegenerator.vala \
valacodenode.c \
valacodenode.h \
valacodenode.vala \
......@@ -352,7 +349,6 @@ valainclude_HEADERS = \
valaclass.h \
valaclassregisterfunction.h \
valacodecontext.h \
valacodegenerator.h \
valacodenode.h \
valacodevisitor.h \
valaconditionalexpression.h \
......@@ -438,11 +434,11 @@ valainclude_HEADERS = \
valawhilestatement.h \
$(NULL)
vala.vala vala.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
vala.vala vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --library vala $^
touch $@
libvala_la_LIBADD = \
libvalacore_la_LIBADD = \
$(GLIB_LIBS) \
../ccode/libvalaccode.la \
$(NULL)
......
......@@ -2,7 +2,7 @@ NULL =
vapidir = $(pkgdatadir)/vapi
vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala
vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala ../gobject/gobject.vala
cat $^ > $@
dist_vapi_DATA = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment