forked from Mirrors/flatpak-builder
Rename library to libflatpak
parent
c24528d369
commit
ba37b22d78
|
@ -52,7 +52,7 @@ lib/xdg-app-version-macros.h
|
|||
xdg-app.pc
|
||||
lib/xdg-app-enum-types.c
|
||||
lib/xdg-app-enum-types.h
|
||||
test-libxdg-app
|
||||
test-libflatpak
|
||||
XdgApp-1.0.*
|
||||
/doc/reference/gtkdoc-check.log
|
||||
/doc/reference/gtkdoc-check.test
|
||||
|
|
16
Makefile.am
16
Makefile.am
|
@ -40,9 +40,9 @@ AM_CPPFLAGS = \
|
|||
-DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \
|
||||
-DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \
|
||||
-DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \
|
||||
-DHELPER=\"$(libdir)/xdg-app/bwrap\" \
|
||||
-DHELPER=\"$(libdir)/flatpak/bwrap\" \
|
||||
-DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\" \
|
||||
-DG_LOG_DOMAIN=\"xdg-app\" \
|
||||
-DG_LOG_DOMAIN=\"flatpak\" \
|
||||
-I$(srcdir)/libglnx \
|
||||
-I$(srcdir)/common \
|
||||
-I$(builddir)/common \
|
||||
|
@ -78,18 +78,18 @@ include document-portal/Makefile.am.inc
|
|||
include tests/Makefile.am.inc
|
||||
|
||||
bwrap_PROGRAMS = bwrap
|
||||
bwrapdir = $(libdir)/xdg-app
|
||||
bwrapdir = $(libdir)/flatpak
|
||||
include bubblewrap/Makefile-bwrap.am.inc
|
||||
|
||||
# NOTE: bwrap is install-bwrapPROGS which is run from install-data, not install-exec, this data-hook is used
|
||||
install-data-hook:
|
||||
$(MAKE) $(AM_MAKEFLAGS) install-test-data-hook
|
||||
if PRIV_MODE_SETUID
|
||||
$(SUDO_BIN) chown root $(DESTDIR)$(libdir)/xdg-app/bwrap
|
||||
$(SUDO_BIN) chmod u+s $(DESTDIR)$(libdir)/xdg-app/bwrap
|
||||
$(SUDO_BIN) chown root $(DESTDIR)$(libdir)/flatpak/bwrap
|
||||
$(SUDO_BIN) chmod u+s $(DESTDIR)$(libdir)/flatpak/bwrap
|
||||
else
|
||||
if PRIV_MODE_FILECAPS
|
||||
$(SUDO_BIN) setcap cap_sys_admin,cap_net_admin,cap_sys_chroot+ep $(DESTDIR)$(libdir)/xdg-app/bwrap
|
||||
$(SUDO_BIN) setcap cap_sys_admin,cap_net_admin,cap_sys_chroot+ep $(DESTDIR)$(libdir)/flatpak/bwrap
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -118,8 +118,8 @@ xdg-app.env: env.d/xdg-app.env.in
|
|||
-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xdg-app.pc
|
||||
EXTRA_DIST += xdg-app.pc.in
|
||||
pkgconfig_DATA = flatpak.pc
|
||||
EXTRA_DIST += flatpak.pc.in
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--enable-documentation \
|
||||
|
|
|
@ -30,6 +30,5 @@ xdg_app_SOURCES = \
|
|||
$(xdp_dbus_built_sources) \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libxdgapp-common.la
|
||||
xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libflatpak-common.la
|
||||
xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
|
||||
|
||||
|
|
|
@ -35,5 +35,5 @@ xdg_app_builder_SOURCES = \
|
|||
$(NULL)
|
||||
|
||||
xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) $(LIBELF_LIBS) \
|
||||
libglnx.la libxdgapp-common.la
|
||||
libglnx.la libflatpak-common.la
|
||||
xdg_app_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
noinst_LTLIBRARIES += libxdgapp-common.la
|
||||
noinst_LTLIBRARIES += libflatpak-common.la
|
||||
|
||||
dbus_built_sources = common/flatpak-dbus.c common/flatpak-dbus.h
|
||||
systemd_dbus_built_sources = common/flatpak-systemd-dbus.c common/flatpak-systemd-dbus.h
|
||||
|
@ -20,7 +20,7 @@ $(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
|
|||
$(srcdir)/data/org.freedesktop.systemd1.xml \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_common_la_SOURCES = \
|
||||
libflatpak_common_la_SOURCES = \
|
||||
common/flatpak-common-types.h \
|
||||
common/flatpak-dir.c \
|
||||
common/flatpak-dir.h \
|
||||
|
@ -43,7 +43,7 @@ libxdgapp_common_la_SOURCES = \
|
|||
$(systemd_dbus_built_sources) \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_common_la_CFLAGS = \
|
||||
libflatpak_common_la_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
$(BASE_CFLAGS) \
|
||||
$(HIDDEN_VISIBILITY_CFLAGS) \
|
||||
|
@ -53,4 +53,4 @@ libxdgapp_common_la_CFLAGS = \
|
|||
$(LIBSECCOMP_CFLAGS) \
|
||||
-I$(srcdir)/dbus-proxy \
|
||||
$(NULL)
|
||||
libxdgapp_common_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(XAUTH_LIBS) $(LIBSECCOMP_LIBS)
|
||||
libflatpak_common_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(XAUTH_LIBS) $(LIBSECCOMP_LIBS)
|
||||
|
|
|
@ -362,7 +362,7 @@ AC_CONFIG_FILES([
|
|||
Makefile
|
||||
doc/Makefile
|
||||
doc/reference/Makefile
|
||||
xdg-app.pc
|
||||
flatpak.pc
|
||||
lib/flatpak-version-macros.h
|
||||
doc/reference/version.xml
|
||||
po/Makefile.in
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
DOC_MODULE = xdg-app
|
||||
DOC_MAIN_SGML_FILE = xdg-app-docs.xml
|
||||
DOC_MODULE = flatpak
|
||||
DOC_MAIN_SGML_FILE = flatpak-docs.xml
|
||||
DOC_SOURCE_DIR = $(top_srcdir)/lib $(top_builddir)/lib
|
||||
|
||||
SCAN_OPTIONS = --rebuild-types \
|
||||
--ignore-decorators='XDG_APP_EXTERN'
|
||||
--ignore-decorators='FLATPAK_EXTERN'
|
||||
SCANGOBJ_OPTIONS =
|
||||
MKDB_OPTIONS = --output-format=xml --name-space=xdg_app
|
||||
MKDB_OPTIONS = --output-format=xml --name-space=flatpak
|
||||
FIXXREF_OPTIONS =
|
||||
|
||||
HFILE_GLOB = $(top_srcdir)/lib/*.h $(top_builddir)/lib/*.h
|
||||
CFILE_GLOB = $(top_srcdir)/lib/*.c
|
||||
|
||||
IGNORE_HFILES = \
|
||||
xdg-app-enum-types.h \
|
||||
xdg-app-installed-ref-private.h \
|
||||
xdg-app-remote-ref-private.h \
|
||||
xdg-app-remote-private.h
|
||||
flatpak-enum-types.h \
|
||||
flatpak-installed-ref-private.h \
|
||||
flatpak-remote-ref-private.h \
|
||||
flatpak-remote-private.h
|
||||
|
||||
EXTRA_HFILES =
|
||||
|
||||
|
@ -25,7 +25,7 @@ content_files =
|
|||
expand_content_files =
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(BASE_CFLAGS)
|
||||
GTKDOC_LIBS = $(top_builddir)/libxdg-app.la $(BASE_LIBS)
|
||||
GTKDOC_LIBS = $(top_builddir)/libflatpak.la $(BASE_LIBS)
|
||||
|
||||
include $(top_srcdir)/gtk-doc.make
|
||||
|
||||
|
|
|
@ -7,21 +7,21 @@
|
|||
]>
|
||||
<book id="index">
|
||||
<bookinfo>
|
||||
<title>xdg-app Library Reference Manual</title>
|
||||
<title>Flatpak Library Reference Manual</title>
|
||||
<releaseinfo>
|
||||
For xdg-app &version;
|
||||
For flatpak &version;
|
||||
</releaseinfo>
|
||||
</bookinfo>
|
||||
|
||||
<chapter>
|
||||
<title>XDG-App</title>
|
||||
<xi:include href="xml/xdg-app-installation.xml"/>
|
||||
<xi:include href="xml/xdg-app-ref.xml"/>
|
||||
<xi:include href="xml/xdg-app-installed-ref.xml"/>
|
||||
<xi:include href="xml/xdg-app-remote-ref.xml"/>
|
||||
<xi:include href="xml/xdg-app-remote.xml"/>
|
||||
<xi:include href="xml/xdg-app-error.xml"/>
|
||||
<xi:include href="xml/xdg-app-version-macros.xml"/>
|
||||
<title>Flatpak</title>
|
||||
<xi:include href="xml/flatpak-installation.xml"/>
|
||||
<xi:include href="xml/flatpak-ref.xml"/>
|
||||
<xi:include href="xml/flatpak-installed-ref.xml"/>
|
||||
<xi:include href="xml/flatpak-remote-ref.xml"/>
|
||||
<xi:include href="xml/flatpak-remote.xml"/>
|
||||
<xi:include href="xml/flatpak-error.xml"/>
|
||||
<xi:include href="xml/flatpak-version-macros.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter id="object-tree">
|
|
@ -29,5 +29,5 @@ xdg_document_portal_SOURCES = \
|
|||
document-portal/xdp-fuse.c \
|
||||
$(NULL)
|
||||
|
||||
xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libxdgapp-common.la
|
||||
xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libflatpak-common.la
|
||||
xdg_document_portal_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(XAUTH_LIBS) $(FUSE_CFLAGS) -I$(srcdir)/document-portal -I$(builddir)/document-portal
|
||||
|
|
|
@ -7,10 +7,10 @@ datadir=@datadir@
|
|||
|
||||
interfaces_dir=${datadir}/dbus-1/interfaces/
|
||||
|
||||
Name: xdg-app
|
||||
Name: flatpak
|
||||
Description: Application sandboxing framework
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0 gio-2.0
|
||||
Requires.private: gio-unix-2.0 ostree-1 libgsystem
|
||||
Libs: -L${libdir} -lxdg-app
|
||||
Cflags: -I${includedir}/xdg-app
|
||||
Libs: -L${libdir} -lflatpak
|
||||
Cflags: -I${includedir}/flatpak
|
|
@ -1,5 +1,5 @@
|
|||
lib_LTLIBRARIES += libxdg-app.la
|
||||
noinst_PROGRAMS += test-libxdg-app
|
||||
lib_LTLIBRARIES += libflatpak.la
|
||||
noinst_PROGRAMS += test-libflatpak
|
||||
|
||||
public_headers = \
|
||||
lib/flatpak.h \
|
||||
|
@ -38,8 +38,8 @@ lib/flatpak-enum-types.c: $(public_headers) lib/flatpak-enum-types.c.template
|
|||
|
||||
EXTRA_DIST += lib/flatpak-enum-types.c.template lib/flatpak-enum-types.h.template
|
||||
|
||||
xdgappincludedir = $(includedir)/xdg-app
|
||||
xdgappinclude_HEADERS = $(public_headers) $(generated_public_headers)
|
||||
flatpakincludedir = $(includedir)/flatpak
|
||||
flatpakinclude_HEADERS = $(public_headers) $(generated_public_headers)
|
||||
|
||||
sources = \
|
||||
lib/flatpak.c \
|
||||
|
@ -56,13 +56,13 @@ sources = \
|
|||
lib/flatpak-installation.c \
|
||||
$(NULL)
|
||||
|
||||
libxdg_app_la_SOURCES = \
|
||||
libflatpak_la_SOURCES = \
|
||||
$(public_headers) \
|
||||
$(generated_public_headers) \
|
||||
$(sources) \
|
||||
$(NULL)
|
||||
|
||||
libxdg_app_la_CFLAGS = \
|
||||
libflatpak_la_CFLAGS = \
|
||||
$(HIDDEN_VISIBILITY_CFLAGS) \
|
||||
-DFLATPAK_COMPILATION \
|
||||
-I$(top_srcdir)/lib \
|
||||
|
@ -73,32 +73,32 @@ libxdg_app_la_CFLAGS = \
|
|||
$(SOUP_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
libxdg_app_la_LDFLAGS = \
|
||||
libflatpak_la_LDFLAGS = \
|
||||
-version-info $(LT_VERSION_INFO) \
|
||||
-export-dynamic \
|
||||
-rpath $(libdir) \
|
||||
$(NULL)
|
||||
|
||||
libxdg_app_la_LIBADD = \
|
||||
libxdgapp-common.la \
|
||||
libflatpak_la_LIBADD = \
|
||||
libflatpak-common.la \
|
||||
$(BASE_LIBS) \
|
||||
$(OSTREE_LIBS) \
|
||||
$(SOUP_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
test_libxdg_app_SOURCES = \
|
||||
test_libflatpak_SOURCES = \
|
||||
lib/test-lib.c \
|
||||
$(NULL)
|
||||
|
||||
test_libxdg_app_CFLAGS = \
|
||||
test_libflatpak_CFLAGS = \
|
||||
$(BASE_CFLAGS) \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_builddir)/lib \
|
||||
$(NULL)
|
||||
|
||||
test_libxdg_app_LDADD = \
|
||||
test_libflatpak_LDADD = \
|
||||
$(BASE_LIBS) \
|
||||
libxdg-app.la \
|
||||
libflatpak.la \
|
||||
$(NULL)
|
||||
|
||||
# gobject-introspection rules
|
||||
|
@ -107,16 +107,16 @@ test_libxdg_app_LDADD = \
|
|||
INTROSPECTION_GIRS =
|
||||
|
||||
if HAVE_INTROSPECTION
|
||||
Flatpak-1.0.gir: libxdg-app.la Makefile
|
||||
Flatpak-1.0.gir: libflatpak.la Makefile
|
||||
|
||||
introspected_headers = $(public_headers)
|
||||
introspected_sources = $(filter-out %-private.h,$(sources))
|
||||
|
||||
Flatpak_1_0_gir_NAMESPACE = Flatpak
|
||||
Flatpak_1_0_gir_VERSION = 1.0
|
||||
Flatpak_1_0_gir_LIBS = libxdg-app.la
|
||||
Flatpak_1_0_gir_LIBS = libflatpak.la
|
||||
Flatpak_1_0_gir_FILES = $(introspected_headers) $(introspected_sources)
|
||||
Flatpak_1_0_gir_CFLAGS = $(libxdg_app_la_CFLAGS)
|
||||
Flatpak_1_0_gir_CFLAGS = $(libflatpak_la_CFLAGS)
|
||||
Flatpak_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
|
||||
Flatpak_1_0_gir_SCANNERFLAGS = \
|
||||
--warn-all \
|
||||
|
|
|
@ -14,5 +14,5 @@ xdg_app_session_helper_SOURCES = \
|
|||
session-helper/flatpak-permission-store.h \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp-common.la
|
||||
xdg_app_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
|
||||
xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS)
|
||||
|
|
|
@ -17,7 +17,7 @@ xdg_app_system_helper_SOURCES = \
|
|||
lib/flatpak-error.c \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libxdgapp-common.la
|
||||
xdg_app_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
|
||||
xdg_app_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
|
||||
|
||||
polkit_rulesdir = $(datadir)/polkit-1/rules.d
|
||||
|
|
|
@ -12,7 +12,7 @@ testdb_LDADD = \
|
|||
$(BASE_LIBS) \
|
||||
$(OSTREE_LIBS) \
|
||||
libglnx.la \
|
||||
libxdgapp-common.la \
|
||||
libflatpak-common.la \
|
||||
$(NULL)
|
||||
testdb_SOURCES = tests/testdb.c
|
||||
|
||||
|
@ -21,7 +21,7 @@ test_doc_portal_LDADD = \
|
|||
$(BASE_LIBS) \
|
||||
$(OSTREE_LIBS) \
|
||||
libglnx.la \
|
||||
libxdgapp-common.la \
|
||||
libflatpak-common.la \
|
||||
$(NULL)
|
||||
test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources)
|
||||
|
||||
|
|
Loading…
Reference in New Issue