diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-26 10:52:21 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-11-19 12:35:04 +0100 |
| commit | 8930bdda8c7824449215c2e8a540f34836b60393 (patch) | |
| tree | 91c5193652ff15c7f4c965acbbeb8e2263ac69ef | |
| parent | a3b7e0ca38a936353b1bdf77c88840df56425574 (diff) | |
| download | vala-8930bdda8c7824449215c2e8a540f34836b60393.tar.gz | |
Update valadate build
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | valadate/Makefile.am | 78 |
2 files changed, 36 insertions, 43 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2eff57d58..fa8223708 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -86,6 +86,7 @@ valactests@PACKAGE_SUFFIX@_CFLAGS = \ CLEANFILES += \ *.gir \ *.stamp \ + $(valadatetests_SOURCES:.vala=.c) \ $(valactests@PACKAGE_SUFFIX@_SOURCES:.vala=.c) \ *.vapi \ rm -R .tests \ diff --git a/valadate/Makefile.am b/valadate/Makefile.am index 250751d39..869bea626 100644 --- a/valadate/Makefile.am +++ b/valadate/Makefile.am @@ -1,11 +1,26 @@ include $(top_srcdir)/Makefile.common +NULL = + +AM_CPPFLAGS = \ + $(COVERAGE_CFLAGS) \ + -I$(top_srcdir)/gee \ + -I$(top_srcdir)/ccode \ + -I$(top_srcdir)/vala \ + -I$(top_srcdir)/codegen \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GMODULE_CFLAGS) \ + -g \ + $(NULL) + +BUILT_SOURCES = valadate.vala.stamp lib_LTLIBRARIES = \ libvaladate.la $(NULL) -libvaladate_la_SOURCES = \ +libvaladate_la_VALASOURCES = \ assembly.vala \ module.vala \ test.vala \ @@ -18,39 +33,28 @@ libvaladate_la_SOURCES = \ testsuite.vala \ $(NULL) -libvaladate_la_VALAFLAGS = \ - --vapidir $(top_srcdir)/vapi \ - --vapidir $(top_srcdir)/gee \ - --vapidir $(top_srcdir)/vala \ - --pkg gio-2.0 \ - --pkg gmodule-2.0 \ - --pkg libvala@PACKAGE_SUFFIX@ \ - --pkg config \ - --library valadate \ - --vapi valadate.vapi \ - -H valadate.h \ - -g \ - $(NULL) - -libvaladate_la_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ - $(GMODULE_CFLAGS) \ +libvaladate_la_SOURCES = \ + valadate.vala.stamp \ + $(libvaladate_la_VALASOURCES:.vala=.c) \ $(NULL) -libvaladate_la_CPPFLAGS = \ - $(GLIB_CPPFLAGS) \ - $(GMODULE_CPPFLAGS) \ - -I$(top_srcdir)/codegen \ - -I$(top_srcdir)/vala \ - -I$(top_srcdir)/gee \ - -I$(top_srcdir)/ccode \ - $(NULL) +valadate.vapi valadate.vala.stamp: $(libvaladate_la_VALASOURCES) + $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ + $(VALAFLAGS) \ + -C \ + -g \ + --vapidir $(top_srcdir)/vapi --pkg gobject-2.0 \ + --pkg gio-2.0 \ + --pkg gmodule-2.0 \ + --pkg config \ + --pkg libvala@PACKAGE_SUFFIX@ \ + -H valadate.h \ + --library valadate \ + $^ + @touch $@ -libvaladate_la_LDFLAGS = \ - -export-dynamic \ - -shared \ - $(NULL) +libvaladate_la_LDFLAGS = -no-undefined libvaladate_la_LIBADD = \ $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \ @@ -60,20 +64,8 @@ libvaladate_la_LIBADD = \ $(GMODULE_LIBS) \ $(NULL) -libvaladateincludedir = $(includedir)/vala@PACKAGE_SUFFIX@ - -libvaladateinclude_HEADERS = \ - valadate.h \ - $(NULL) - EXTRA_DIST = $(libvaladate_la_VALASOURCES) valadate.vapi valadate.vala.stamp -CLEANFILES = \ - $(libvaladate_la_SOURCES:.vala=.c) \ - valadate.vapi \ - valadate.h \ - $(NULL) - MAINTAINERCLEANFILES = \ valadate.vapi \ valadate.h \ |