mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-09 01:18:35 +03:00
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
This commit is contained in:
parent
00c352ba67
commit
d1babde95e
@ -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
|
||||
|
@ -21,6 +21,7 @@ AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
|
||||
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34 \
|
||||
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_40
|
||||
AM_CFLAGS = $(WARN_CFLAGS)
|
||||
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-maintainer-mode
|
||||
|
||||
# Subdirectories
|
||||
SUBDIRS =
|
||||
|
Loading…
Reference in New Issue
Block a user