diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
| commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
| tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /tests/offsets/Makefile.am | |
| parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
| parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
| download | gobject-introspection-baserock/markdoffman/1_39_90-merge.tar.gz | |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'tests/offsets/Makefile.am')
| -rw-r--r-- | tests/offsets/Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 4f03830e..a3ec78b1 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -6,12 +6,12 @@ CLEANFILES = EXTRA_DIST = INTROSPECTION_GIRS = -check_LTLIBRARIES = -check_PROGRAMS = +EXTRA_LTLIBRARIES = +EXTRA_PROGRAMS = ############################################################ -check_LTLIBRARIES += liboffsets.la +EXTRA_LTLIBRARIES += liboffsets.la liboffsets_la_SOURCES = \ offsets.h \ @@ -28,27 +28,29 @@ Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error INTROSPECTION_GIRS += Offsets-1.0.gir -CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib +CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la ############################################################ -check_PROGRAMS += gitestoffsets +EXTRA_PROGRAMS += gitestoffsets nodist_gitestoffsets_SOURCES = gitestoffsets.c gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) -gitestoffsets.c: gen-gitestoffsets offsets.h +gitestoffsets.c: gen-gitestoffsets offsets.h Offsets-1.0.typelib $(AM_V_GEN) $(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false ) EXTRA_DIST += gen-gitestoffsets BUILT_SOURCES += gitestoffsets.c -CLEANFILES += gitestoffsets.c +CLEANFILES += gitestoffsets.c $(EXTRA_PROGRAMS) ############################################################ -check-local: Offsets-1.0.typelib - GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected - diff -u offsets.compiled offsets.introspected +# The trailing "echo" in TESTS_ENVIRONMENT is used to ignore automake passing +# gitestoffsets as we already run this in the same command line. +TESTS = gitestoffsets +LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \ + diff -u offsets.compiled offsets.introspected && echo CLEANFILES += offsets.compiled offsets.introspected |