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/Makefile.am | |
parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
download | gobject-introspection-68ff94340891f1ae4ea24546acdbbc39c4dcbcd0.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/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b6d6ebd2..26b59108 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,18 +1,12 @@ include $(top_srcdir)/common.mk SUBDIRS = . scanner repository offsets warn -DIST_SUBDIRS = $(SUBDIRS) -if BUILD_DOCTOOL -SUBDIRS += doctool -else -DIST_SUBDIRS += doctool -endif EXTRA_DIST= BUILT_SOURCES= CLEANFILES= -INCLUDES = $(GOBJECT_CFLAGS) +AM_CFLAGS = $(GOBJECT_CFLAGS) LIBADD = $(GOBJECT_LIBS) testsdir = $(datadir)/gobject-introspection-1.0/tests @@ -22,19 +16,24 @@ tests_DATA = \ gimarshallingtests.c \ gimarshallingtests.h -check_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la +EXTRA_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la libeverything_1_0_la_SOURCES = everything.c libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c -EXTRA_DIST += gimarshallingtests.h +EXTRA_DIST += \ + gimarshallingtests.h \ + gi-tester BUILT_SOURCES += everything.c everything.h CLEANFILES += \ $(BUILT_SOURCES) \ + $(EXTRA_LTLIBRARIES) \ everything-stamp.h \ + Everything-1.0.gir \ Everything-1.0.typelib \ + GIMarshallingTests-1.0.gir \ GIMarshallingTests-1.0.typelib everything-stamp.h: Makefile @@ -67,5 +66,5 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile %.typelib: %.gir $(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@ -check: Everything-1.0.typelib GIMarshallingTests-1.0.typelib - +TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib +LOG_COMPILER=$(srcdir)/gi-tester |