GNOME.org
 

[vala] Switch build system to not use legacy headers

commit 21fb9982ed6dc8e0efa2c39d0edc34649e0dda80
Author: Jürg Billeter <j bitron ch>
Date:   Fri Apr 3 16:11:45 2009 +0200

    Switch build system to not use legacy headers
---
 ccode/Makefile.am    |    9 ++++-----
 compiler/Makefile.am |    8 +++++---
 gee/Makefile.am      |    8 +++-----
 gobject/Makefile.am  |   11 ++++++-----
 tests/testrunner.sh  |    2 +-
 vala/Makefile.am     |   10 +++++-----
 vapigen/Makefile.am  |   10 +++++-----
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 77801da..6815c1a 100644
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) \
+	-I$(top_srcdir)/gee \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
@@ -66,17 +66,16 @@ libvalaccode_la_VALASOURCES = \
 libvalaccode_la_SOURCES = \
 	ccode.vala.stamp \
 	$(libvalaccode_la_VALASOURCES:.vala=.c) \
-	$(libvalaccode_la_VALASOURCES:.vala=.h) \
 	$(NULL)
 
-ccodeincludedir = $(includedir)/vala-1.0/ccode
+ccodeincludedir = $(includedir)/vala-1.0
 
 ccodeinclude_HEADERS = \
-	$(libvalaccode_la_VALASOURCES:.vala=.h) \
+	valaccode.h \
 	$(NULL)
 
 ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee -H valaccode.h --library ccode $^
 	touch $@
 
 libvalaccode_la_LIBADD = \
diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 7533ff6..a928231 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -1,7 +1,10 @@
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) \
+	-I$(top_srcdir)/gee \
+	-I$(top_srcdir)/ccode \
+	-I$(top_srcdir)/vala \
+	-I$(top_srcdir)/gobject \
 	$(GLIB_CFLAGS) \
 	-include config.h \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
@@ -20,11 +23,10 @@ valac_VALASOURCES = \
 valac_SOURCES = \
 	valac.vala.stamp \
 	$(valac_VALASOURCES:.vala=.c) \
-	$(valac_VALASOURCES:.vala=.h) \
 	$(NULL)
 
 valac.vala.stamp: $(valac_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
 	touch $@
 
 valac_LDADD = \
diff --git a/gee/Makefile.am b/gee/Makefile.am
index 40a363d..3163178 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
@@ -31,17 +30,16 @@ libgee_la_VALASOURCES = \
 libgee_la_SOURCES = \
 	gee.vala.stamp \
 	$(libgee_la_VALASOURCES:.vala=.c) \
-	$(libgee_la_VALASOURCES:.vala=.h) \
 	$(NULL)
 
-geeincludedir = $(includedir)/vala-1.0/gee
+geeincludedir = $(includedir)/vala-1.0
 
 geeinclude_HEADERS = \
-	$(libgee_la_VALASOURCES:.vala=.h) \
+	gee.h \
 	$(NULL)
 
 gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --basedir $(top_srcdir) --library gee $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H gee.h --library gee $^
 	touch $@
 
 libgee_la_LIBADD = \
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 3e1b140..a6c7ac7 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -1,7 +1,9 @@
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) \
+	-I$(top_srcdir)/gee \
+	-I$(top_srcdir)/ccode \
+	-I$(top_srcdir)/vala \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
@@ -43,17 +45,16 @@ libvala_la_VALASOURCES = \
 libvala_la_SOURCES = \
 	gobject.vala.stamp \
 	$(libvala_la_VALASOURCES:.vala=.c) \
-	$(libvala_la_VALASOURCES:.vala=.h) \
 	$(NULL)
 
-gobjectincludedir = $(includedir)/vala-1.0/gobject
+gobjectincludedir = $(includedir)/vala-1.0
 
 gobjectinclude_HEADERS = \
-	$(libvala_la_VALASOURCES:.vala=.h) \
+	valagobject.h \
 	$(NULL)
 
 gobject.vapi gobject.vala.stamp: $(libvala_la_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala -H valagobject.h --library gobject $^
 	touch $@
 
 libvala_la_LDFLAGS = -no-undefined
diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 00a6240..57d4d2b 100755
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -31,7 +31,7 @@ export G_DEBUG=fatal_warnings
 VALAC=$topbuilddir/compiler/valac
 VALAFLAGS="--vapidir $vapidir"
 CC="gcc -std=c99"
-CFLAGS="-O0 -g3 -I$topsrcdir -I$topbuilddir"
+CFLAGS="-O0 -g3"
 LDLIBS="-lm"
 
 CODE=0
diff --git a/vala/Makefile.am b/vala/Makefile.am
index dac7d44..0f475b4 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,7 +1,8 @@
 NULL =
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) \
+	-I$(top_srcdir)/gee \
+	-I$(top_srcdir)/ccode \
 	$(GLIB_CFLAGS) \
 	-include config.h \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
@@ -153,17 +154,16 @@ libvalacore_la_VALASOURCES = \
 libvalacore_la_SOURCES = \
 	vala.vala.stamp \
 	$(libvalacore_la_VALASOURCES:.vala=.c) \
-	$(libvalacore_la_VALASOURCES:.vala=.h) \
 	$(NULL)
 
-valaincludedir = $(includedir)/vala-1.0/vala
+valaincludedir = $(includedir)/vala-1.0
 
 valainclude_HEADERS = \
-	$(libvalacore_la_VALASOURCES:.vala=.h) \
+	vala.h \
 	$(NULL)
 
 vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config --basedir $(top_srcdir) --library vala $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config -H vala.h --library vala $^
 	touch $@
 
 libvalacore_la_LIBADD = \
diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 62a6d52..da522e4 100644
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -8,7 +8,9 @@ SUBDIRS = \
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	-I$(top_srcdir) \
+	-I$(top_srcdir)/gee \
+	-I$(top_srcdir)/ccode \
+	-I$(top_srcdir)/vala \
 	-I$(top_srcdir)/gobject-introspection \
 	$(NULL)
 
@@ -29,7 +31,6 @@ vapigen_VALASOURCES = \
 vapigen_SOURCES = \
 	vapigen.vala.stamp \
 	$(vapigen_VALASOURCES:.vala=.c) \
-	$(vapigen_VALASOURCES:.vala=.h) \
 	$(NULL)
 
 vapicheck_VALASOURCES = \
@@ -39,15 +40,14 @@ vapicheck_VALASOURCES = \
 vapicheck_SOURCES = \
 	vapicheck.vala.stamp \
 	$(vapicheck_VALASOURCES:.vala=.c) \
-	$(vapicheck_VALASOURCES:.vala=.h) \
 	$(NULL)
 
 vapigen.vala.stamp: $(vapigen_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
 	touch $@
 
 vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
-	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
 	touch $@
 
 vapigen_LDADD = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]