Commit 21fb9982 authored by Jürg Billeter's avatar Jürg Billeter

Switch build system to not use legacy headers

parent 6fe24769
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 = \
......
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 = \
......
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 = \
......
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
......
......@@ -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
......
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 = \
......
......@@ -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 = \
......
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