diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-08-12 16:27:42 +0200 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-08-17 14:57:05 -0400 |
| commit | d1babde95e9afa3da9beb2f906cef14ceda2aeb4 (patch) | |
| tree | eda82a73dde237997b7c03128cdf9f8a0c4bc96a /Makefile-libostree.am | |
| parent | 00c352ba6778d41100bca5687f2e088da0843fe3 (diff) | |
| download | ostree-d1babde95e9afa3da9beb2f906cef14ceda2aeb4.tar.gz | |
Fix make distcheck
make distcheck was unhappy for various reasons:
* headers aren't data, so use _HEADERS otherwise compilation fails
* Mark the gir & typelib data as cleanfiles so they aren't left around
after make clean
* Don't nuke the .la file. This breaks make uninstall, leave it up to
distributions to not install .la files if they don't want them.
https://bugzilla.gnome.org/show_bug.cgi?id=705850
Diffstat (limited to 'Makefile-libostree.am')
| -rw-r--r-- | Makefile-libostree.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 8166f45e..1227c034 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -21,8 +21,8 @@ include Makefile-libostree-defines.am lib_LTLIBRARIES += libostree-1.la -libostreeheadersdir = $(includedir)/ostree-1 -libostreeheaders_DATA = $(libostree_public_headers) +libostreeincludedir = $(includedir)/ostree-1 +libostreeinclude_HEADERS = $(libostree_public_headers) libostree_1_la_SOURCES = \ src/libostree/ostree-core.c \ @@ -79,10 +79,8 @@ OSTree_1_0_gir_FILES = $(libostreeheaders_DATA) $(filter-out %-private.h,$(libos INTROSPECTION_GIRS += OSTree-1.0.gir gir_DATA += OSTree-1.0.gir typelib_DATA += OSTree-1.0.typelib + +CLEANFILES += $(gir_DATA) $(typelib_DATA) endif pkgconfig_DATA += src/libostree/ostree-1.pc - -INSTALL_DATA_HOOKS += install-libostree-data-hook -install-libostree-data-hook: - rm -f $(DESTDIR)$(libdir)/libostree-1.la |