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 /Makefile-girepository.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 'Makefile-girepository.am')
-rw-r--r-- | Makefile-girepository.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile-girepository.am b/Makefile-girepository.am index 2c07b3ab..1f956ed0 100644 --- a/Makefile-girepository.am +++ b/Makefile-girepository.am @@ -1,3 +1,6 @@ +EXTRA_DIST += \ + girepository/docs.c + girepodir = $(includedir)/gobject-introspection-1.0/ girepo_HEADERS = \ girepository/giarginfo.h \ @@ -66,13 +69,15 @@ libgirepository_1_0_la_SOURCES = \ girepository/gitypeinfo.c \ girepository/gitypelib.c \ girepository/gitypelib-internal.h \ - girepository/glib-compat.h \ girepository/giunioninfo.c \ girepository/givfuncinfo.c libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -DG_IREPOSITORY_COMPILATION libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS) -libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 -export-symbols-regex '^gi?_' +libgirepository_1_0_la_LDFLAGS = \ + $(EXTRA_LINK_FLAGS) \ + -no-undefined -version-number 1:0:0 \ + -export-symbols $(srcdir)/girepository/girepository.symbols gdumpdir = $(datadir)/gobject-introspection-1.0/ gdump_DATA = girepository/gdump.c @@ -85,7 +90,9 @@ gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS) gi_dump_types_LDADD = $(GIO_UNIX_LIBS) $(GMODULE_LIBS) endif -GTESTER_PROGS += gthash-test +EXTRA_PROGRAMS += gthash-test +CLEANFILES += gthash-test +TESTS += gthash-test gthash_test_SOURCES = girepository/gthash.c girepository/gthash-test.c gthash_test_CFLAGS = -I$(top_srcdir)/girepository $(GOBJECT_CFLAGS) |