Makefile.in (flatpak-1.15.0.tar.xz) | : | Makefile.in (flatpak-1.15.1.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 350 | skipping to change at line 350 | |||
common/libflatpak_common_base_la-flatpak-document-dbus-generated.lo | common/libflatpak_common_base_la-flatpak-document-dbus-generated.lo | |||
nodist_libflatpak_common_base_la_OBJECTS = $(am__objects_2) \ | nodist_libflatpak_common_base_la_OBJECTS = $(am__objects_2) \ | |||
$(am__objects_1) | $(am__objects_1) | |||
libflatpak_common_base_la_OBJECTS = \ | libflatpak_common_base_la_OBJECTS = \ | |||
$(am_libflatpak_common_base_la_OBJECTS) \ | $(am_libflatpak_common_base_la_OBJECTS) \ | |||
$(nodist_libflatpak_common_base_la_OBJECTS) | $(nodist_libflatpak_common_base_la_OBJECTS) | |||
libflatpak_common_base_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | libflatpak_common_base_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | |||
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | |||
$(libflatpak_common_base_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | $(libflatpak_common_base_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |||
$(LDFLAGS) -o $@ | $(LDFLAGS) -o $@ | |||
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) | am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) | ||||
libflatpak_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | libflatpak_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | |||
$(am__DEPENDENCIES_1) | $(am__DEPENDENCIES_1) | |||
am__libflatpak_common_la_SOURCES_DIST = common/flatpak.h \ | am__libflatpak_common_la_SOURCES_DIST = common/flatpak.h \ | |||
skipping to change at line 1509 | skipping to change at line 1510 | |||
CYGPATH_W = @CYGPATH_W@ | CYGPATH_W = @CYGPATH_W@ | |||
DBUS_CONFIG_DIR = @DBUS_CONFIG_DIR@ | DBUS_CONFIG_DIR = @DBUS_CONFIG_DIR@ | |||
DBUS_PROXY = @DBUS_PROXY@ | DBUS_PROXY = @DBUS_PROXY@ | |||
DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@ | DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@ | |||
DCONF_CFLAGS = @DCONF_CFLAGS@ | DCONF_CFLAGS = @DCONF_CFLAGS@ | |||
DCONF_LIBS = @DCONF_LIBS@ | DCONF_LIBS = @DCONF_LIBS@ | |||
DEFS = @DEFS@ | DEFS = @DEFS@ | |||
DEPDIR = @DEPDIR@ | DEPDIR = @DEPDIR@ | |||
DEP_GPGME_CFLAGS = @DEP_GPGME_CFLAGS@ | DEP_GPGME_CFLAGS = @DEP_GPGME_CFLAGS@ | |||
DEP_GPGME_LIBS = @DEP_GPGME_LIBS@ | DEP_GPGME_LIBS = @DEP_GPGME_LIBS@ | |||
DEP_GPGME_PTHREAD_CFLAGS = @DEP_GPGME_PTHREAD_CFLAGS@ | ||||
DEP_GPGME_PTHREAD_LIBS = @DEP_GPGME_PTHREAD_LIBS@ | ||||
DLLTOOL = @DLLTOOL@ | DLLTOOL = @DLLTOOL@ | |||
DSYMUTIL = @DSYMUTIL@ | DSYMUTIL = @DSYMUTIL@ | |||
DUMPBIN = @DUMPBIN@ | DUMPBIN = @DUMPBIN@ | |||
ECHO_C = @ECHO_C@ | ECHO_C = @ECHO_C@ | |||
ECHO_N = @ECHO_N@ | ECHO_N = @ECHO_N@ | |||
ECHO_T = @ECHO_T@ | ECHO_T = @ECHO_T@ | |||
EGREP = @EGREP@ | EGREP = @EGREP@ | |||
ETAGS = @ETAGS@ | ETAGS = @ETAGS@ | |||
EXEEXT = @EXEEXT@ | EXEEXT = @EXEEXT@ | |||
FGREP = @FGREP@ | FGREP = @FGREP@ | |||
skipping to change at line 1898 | skipping to change at line 1901 | |||
AM_CFLAGS = $(WARN_CFLAGS) $(ASAN_FLAGS) | AM_CFLAGS = $(WARN_CFLAGS) $(ASAN_FLAGS) | |||
AM_LDFLAGS = $(ASAN_FLAGS) | AM_LDFLAGS = $(ASAN_FLAGS) | |||
triggersdir = $(pkgdatadir)/triggers | triggersdir = $(pkgdatadir)/triggers | |||
dist_triggers_SCRIPTS = \ | dist_triggers_SCRIPTS = \ | |||
triggers/gtk-icon-cache.trigger \ | triggers/gtk-icon-cache.trigger \ | |||
triggers/mime-database.trigger \ | triggers/mime-database.trigger \ | |||
triggers/desktop-database.trigger \ | triggers/desktop-database.trigger \ | |||
$(NULL) | $(NULL) | |||
# This canonicalizes the PKG_CHECK_MODULES or AM_PATH_GPGME results | # This canonicalizes the PKG_CHECK_MODULES or AM_PATH_GPGME results | |||
INTERNAL_GPGME_CFLAGS = $(DEP_GPGME_CFLAGS) $(GPGME_PTHREAD_CFLAGS) | INTERNAL_GPGME_CFLAGS = $(DEP_GPGME_CFLAGS) $(DEP_GPGME_PTHREAD_CFLAGS) $(GPGME_ | |||
INTERNAL_GPGME_LIBS = $(DEP_GPGME_LIBS) $(GPGME_PTHREAD_LIBS) | PTHREAD_CFLAGS) | |||
INTERNAL_GPGME_LIBS = $(DEP_GPGME_LIBS) $(DEP_GPGME_PTHREAD_LIBS) $(GPGME_PTHREA | ||||
D_LIBS) | ||||
lib_LTLIBRARIES = libflatpak.la | lib_LTLIBRARIES = libflatpak.la | |||
libglnx_srcpath := $(srcdir)/subprojects/libglnx | libglnx_srcpath := $(srcdir)/subprojects/libglnx | |||
# This intentionally does not include AM_CFLAGS, libglnx always uses those | ||||
libglnx_cflags := \ | libglnx_cflags := \ | |||
$(BASE_CFLAGS) \ | $(BASE_CFLAGS) \ | |||
"-I$(libglnx_srcpath)" \ | "-I$(libglnx_srcpath)" \ | |||
-std=gnu99 \ | -std=gnu99 \ | |||
$(HIDDEN_VISIBILITY_CFLAGS) \ | $(HIDDEN_VISIBILITY_CFLAGS) \ | |||
$(NULL) | $(NULL) | |||
libglnx_libs := $(BASE_LIBS) | libglnx_libs := $(BASE_LIBS) | |||
libglnx_la_SOURCES = \ | libglnx_la_SOURCES = \ | |||
subprojects/libglnx/glnx-macros.h \ | subprojects/libglnx/glnx-macros.h \ | |||
skipping to change at line 2381 | skipping to change at line 2385 | |||
$(OSTREE_CFLAGS) \ | $(OSTREE_CFLAGS) \ | |||
$(SOUP_CFLAGS) \ | $(SOUP_CFLAGS) \ | |||
$(JSON_CFLAGS) \ | $(JSON_CFLAGS) \ | |||
-DFLATPAK_COMPILATION \ | -DFLATPAK_COMPILATION \ | |||
-DDATADIR=\"$(datadir)\" \ | -DDATADIR=\"$(datadir)\" \ | |||
$(NULL) | $(NULL) | |||
flatpak_oci_authenticator_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/oci-authentica tor | flatpak_oci_authenticator_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/oci-authentica tor | |||
flatpak_validate_icon_SOURCES = icon-validator/validate-icon.c | flatpak_validate_icon_SOURCES = icon-validator/validate-icon.c | |||
flatpak_validate_icon_LDADD = $(GDK_PIXBUF_LIBS) | flatpak_validate_icon_LDADD = $(GDK_PIXBUF_LIBS) | |||
flatpak_validate_icon_CFLAGS = $(GDK_PIXBUF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir) \" | flatpak_validate_icon_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) -DLIBEXECDIR=\" $(libexecdir)\" | |||
revokefs_fuse_SOURCES = revokefs/main.c revokefs/writer.c revokefs/writer.h | revokefs_fuse_SOURCES = revokefs/main.c revokefs/writer.c revokefs/writer.h | |||
revokefs_fuse_CFLAGS = $(BASE_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(FUS E_CFLAGS) -I$(srcdir)/libglnx | revokefs_fuse_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_ BITS=64 $(FUSE_CFLAGS) | |||
revokefs_fuse_LDADD = libglnx.la $(BASE_LIBS) $(FUSE_LIBS) | revokefs_fuse_LDADD = libglnx.la $(BASE_LIBS) $(FUSE_LIBS) | |||
revokefs_demo_SOURCES = revokefs/demo.c | revokefs_demo_SOURCES = revokefs/demo.c | |||
revokefs_demo_CFLAGS = $(BASE_CFLAGS) | revokefs_demo_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) | |||
revokefs_demo_LDADD = $(BASE_LIBS) | revokefs_demo_LDADD = $(BASE_LIBS) | |||
@BUILD_SELINUX_MODULE_TRUE@selinux_moduledir = ${datadir}/selinux/packages | @BUILD_SELINUX_MODULE_TRUE@selinux_moduledir = ${datadir}/selinux/packages | |||
@BUILD_SELINUX_MODULE_TRUE@selinux_module_DATA = $(NULL) \ | @BUILD_SELINUX_MODULE_TRUE@selinux_module_DATA = $(NULL) \ | |||
@BUILD_SELINUX_MODULE_TRUE@ flatpak.pp.bz2 | @BUILD_SELINUX_MODULE_TRUE@ flatpak.pp.bz2 | |||
@BUILD_SELINUX_MODULE_TRUE@selinux_develdir = ${datadir}/selinux/devel/include/c ontrib | @BUILD_SELINUX_MODULE_TRUE@selinux_develdir = ${datadir}/selinux/devel/include/c ontrib | |||
@BUILD_SELINUX_MODULE_TRUE@selinux_devel_DATA = $(NULL) \ | @BUILD_SELINUX_MODULE_TRUE@selinux_devel_DATA = $(NULL) \ | |||
@BUILD_SELINUX_MODULE_TRUE@ selinux/flatpak.if | @BUILD_SELINUX_MODULE_TRUE@ selinux/flatpak.if | |||
@BUILD_AUTO_SIDELOADING_TRUE@dist_libexec_SCRIPTS = sideload-repos-systemd/flatp ak-create-sideload-symlinks.sh | @BUILD_AUTO_SIDELOADING_TRUE@dist_libexec_SCRIPTS = sideload-repos-systemd/flatp ak-create-sideload-symlinks.sh | |||
@BUILD_AUTO_SIDELOADING_TRUE@path_in_files = sideload-repos-systemd/flatpak-side load-usb-repo.path.in | @BUILD_AUTO_SIDELOADING_TRUE@path_in_files = sideload-repos-systemd/flatpak-side load-usb-repo.path.in | |||
@BUILD_AUTO_SIDELOADING_TRUE@tmpfilesdir = $(prefix)/lib/tmpfiles.d | @BUILD_AUTO_SIDELOADING_TRUE@tmpfilesdir = $(prefix)/lib/tmpfiles.d | |||
End of changes. 7 change blocks. | ||||
6 lines changed or deleted | 12 lines changed or added |