Commit ea232056 authored by Jürg Billeter's avatar Jürg Billeter
Browse files

Fix build with Vala 0.7

Based on patch by Thijs Vermeir, fixes bug 579182.
parent 10e649f7
......@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl
NULL =
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(NULL)
......@@ -32,17 +31,16 @@ libgee_la_VALASOURCES = \
libgee_la_SOURCES = \
gee.vala.stamp \
$(libgee_la_VALASOURCES:.vala=.c) \
$(libgee_la_VALASOURCES:.vala=.h) \
$(NULL)
geeincludedir = $(includedir)/gee-1.0/gee
geeincludedir = $(includedir)/gee-1.0
geeinclude_HEADERS = \
$(libgee_la_VALASOURCES:.vala=.h) \
gee.h \
$(NULL)
gee-1.0.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
$(VALAC) -C --basedir $(top_srcdir) --library gee-1.0 $^
$(VALAC) -C -H gee.h --library gee-1.0 $^
touch $@
libgee_la_LIBADD = \
......
/* gee.h
*
* Copyright (C) 2007 Jürg Billeter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author:
* Jürg Billeter <j@bitron.ch>
*/
#ifndef __GEE_H__
#define __GEE_H__
#include <gee/arraylist.h>
#include <gee/collection.h>
#include <gee/hashmap.h>
#include <gee/hashset.h>
#include <gee/iterable.h>
#include <gee/iterator.h>
#include <gee/list.h>
#include <gee/map.h>
#include <gee/readonlycollection.h>
#include <gee/readonlylist.h>
#include <gee/readonlymap.h>
#include <gee/readonlyset.h>
#include <gee/set.h>
#endif
......@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
NULL =
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gee \
$(GLIB_CFLAGS) \
$(NULL)
......@@ -13,7 +13,7 @@ progs_ldadd = $(GLIB_LIBS) ../gee/libgee.la
TEST_PROGS += testarraylist
testarraylist_VALASOURCES = testarraylist.vala
testarraylist_SOURCES = testarraylist.c testarraylist.h
testarraylist_SOURCES = testarraylist.c
$(testarraylist_SOURCES): $(testarraylist_VALASOURCES)
$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
touch $@
......@@ -22,7 +22,7 @@ EXTRA_DIST += $(testarraylist_VALASOURCES)
TEST_PROGS += testhashmap
testhashmap_VALASOURCES = testhashmap.vala
testhashmap_SOURCES = testhashmap.c testhashmap.h
testhashmap_SOURCES = testhashmap.c
$(testhashmap_SOURCES): $(testhashmap_VALASOURCES)
$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
touch $@
......@@ -31,7 +31,7 @@ EXTRA_DIST += $(testhashmap_VALASOURCES)
TEST_PROGS += testhashset
testhashset_VALASOURCES = testhashset.vala
testhashset_SOURCES = testhashset.c testhashset.h
testhashset_SOURCES = testhashset.c
$(testhashset_SOURCES): $(testhashset_VALASOURCES)
$(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
touch $@
......
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