forked from Mirrors/flatpak-builder
Rename lib/ to common/ in preparation for public xdg-app library
parent
49af288937
commit
106a5b06ec
|
@ -25,8 +25,8 @@ AM_CPPFLAGS = \
|
|||
-DHELPER=\"$(bindir)/xdg-app-helper\" \
|
||||
-DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\" \
|
||||
-I$(srcdir)/libglnx \
|
||||
-I$(srcdir)/lib \
|
||||
-I$(builddir)/lib \
|
||||
-I$(srcdir)/common \
|
||||
-I$(builddir)/common \
|
||||
$(NULL)
|
||||
|
||||
triggersdir = $(pkgdatadir)/triggers
|
||||
|
@ -44,7 +44,7 @@ libglnx_cflags := $(BASE_CFLAGS) "-I$(libglnx_srcpath)"
|
|||
libglnx_libs := $(BASE_LIBS)
|
||||
include libglnx/Makefile-libglnx.am.inc
|
||||
|
||||
include lib/Makefile.am.inc
|
||||
include common/Makefile.am.inc
|
||||
include data/Makefile.am.inc
|
||||
include app/Makefile.am.inc
|
||||
include builder/Makefile.am.inc
|
||||
|
|
|
@ -27,6 +27,6 @@ xdg_app_SOURCES = \
|
|||
$(xdp_dbus_built_sources) \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libxdgapp.la
|
||||
xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libxdgapp-common.la
|
||||
xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
|
||||
|
||||
|
|
|
@ -30,6 +30,6 @@ xdg_app_builder_SOURCES = \
|
|||
builder/builder-utils.h \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libxdgapp.la
|
||||
xdg_app_builder_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBARCHIVE_LIBS) libglnx.la libxdgapp-common.la
|
||||
xdg_app_builder_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS) $(LIBARCHIVE_CFLAGS)
|
||||
|
||||
|
|
|
@ -0,0 +1,66 @@
|
|||
noinst_LTLIBRARIES += libxdgapp-common.la
|
||||
|
||||
dbus_built_sources = common/xdg-app-dbus.c common/xdg-app-dbus.h
|
||||
systemd_dbus_built_sources = common/xdg-app-systemd-dbus.c common/xdg-app-systemd-dbus.h
|
||||
BUILT_SOURCES += $(dbus_built_sources) $(systemd_dbus_built_sources)
|
||||
|
||||
$(dbus_built_sources) : data/org.freedesktop.XdgApp.xml
|
||||
$(AM_V_GEN) $(GDBUS_CODEGEN) \
|
||||
--interface-prefix org.freedesktop.XdgApp. \
|
||||
--c-namespace XdgApp \
|
||||
--generate-c-code $(builddir)/common/xdg-app-dbus \
|
||||
$(srcdir)/data/org.freedesktop.XdgApp.xml \
|
||||
$(NULL)
|
||||
|
||||
$(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
|
||||
$(AM_V_GEN) $(GDBUS_CODEGEN) \
|
||||
--interface-prefix org.freedesktop.systemd1. \
|
||||
--c-namespace Systemd \
|
||||
--generate-c-code $(builddir)/common/xdg-app-systemd-dbus \
|
||||
$(srcdir)/data/org.freedesktop.systemd1.xml \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_common_la_SOURCES = \
|
||||
common/xdg-app-dir.c \
|
||||
common/xdg-app-dir.h \
|
||||
common/xdg-app-run.c \
|
||||
common/xdg-app-run.h \
|
||||
common/xdg-app-error.c \
|
||||
common/xdg-app-error.h \
|
||||
common/xdg-app-utils.c \
|
||||
common/xdg-app-utils.h \
|
||||
common/xdg-app-chain-input-stream.c \
|
||||
common/xdg-app-chain-input-stream.h \
|
||||
common/gvdb/gvdb-reader.h \
|
||||
common/gvdb/gvdb-format.h \
|
||||
common/gvdb/gvdb-reader.c \
|
||||
common/gvdb/gvdb-builder.h \
|
||||
common/gvdb/gvdb-builder.c \
|
||||
common/xdg-app-db.c \
|
||||
common/xdg-app-db.h \
|
||||
$(dbus_built_sources) \
|
||||
$(systemd_dbus_built_sources) \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_common_la_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(XAUTH_CFLAGS) -I$(srcdir)/dbus-proxy
|
||||
libxdgapp_common_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(XAUTH_LIBS)
|
||||
|
||||
bin_PROGRAMS += \
|
||||
xdg-app-helper \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_helper_SOURCES = common/xdg-app-helper.c
|
||||
xdg_app_helper_LDADD = $(LIBSECCOMP_LIBS)
|
||||
xdg_app_helper_CFLAGS = $(LIBSECCOMP_CFLAGS)
|
||||
|
||||
install-exec-hook:
|
||||
if DISABLE_USERNS
|
||||
if PRIV_MODE_SETUID
|
||||
$(SUDO_BIN) chown root $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
$(SUDO_BIN) chmod u+s $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
else
|
||||
if PRIV_MODE_FILECAPS
|
||||
$(SUDO_BIN) setcap cap_sys_admin+ep $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
endif
|
||||
endif
|
||||
endif
|
|
@ -11,7 +11,7 @@ AC_DISABLE_STATIC
|
|||
LT_PREREQ([2.2.6])
|
||||
LT_INIT([disable-static])
|
||||
|
||||
AC_CONFIG_SRCDIR([lib/xdg-app-helper.c])
|
||||
AC_CONFIG_SRCDIR([common/xdg-app-helper.c])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([1.11 no-define no-dist-gzip dist-xz tar-ustar foreign subdir-objects])
|
||||
|
|
|
@ -41,5 +41,5 @@ xdg_document_portal_SOURCES = \
|
|||
document-portal/xdp-fuse.c \
|
||||
$(NULL)
|
||||
|
||||
xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libxdgapp.la
|
||||
xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libxdgapp-common.la
|
||||
xdg_document_portal_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(XAUTH_LIBS) $(FUSE_CFLAGS) -I$(srcdir)/document-portal -I$(builddir)/document-portal
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
noinst_LTLIBRARIES += libxdgapp.la
|
||||
|
||||
dbus_built_sources = lib/xdg-app-dbus.c lib/xdg-app-dbus.h
|
||||
systemd_dbus_built_sources = lib/xdg-app-systemd-dbus.c lib/xdg-app-systemd-dbus.h
|
||||
BUILT_SOURCES += $(dbus_built_sources) $(systemd_dbus_built_sources)
|
||||
|
||||
$(dbus_built_sources) : data/org.freedesktop.XdgApp.xml
|
||||
$(AM_V_GEN) $(GDBUS_CODEGEN) \
|
||||
--interface-prefix org.freedesktop.XdgApp. \
|
||||
--c-namespace XdgApp \
|
||||
--generate-c-code $(builddir)/lib/xdg-app-dbus \
|
||||
$(srcdir)/data/org.freedesktop.XdgApp.xml \
|
||||
$(NULL)
|
||||
|
||||
$(systemd_dbus_built_sources) : data/org.freedesktop.systemd1.xml
|
||||
$(AM_V_GEN) $(GDBUS_CODEGEN) \
|
||||
--interface-prefix org.freedesktop.systemd1. \
|
||||
--c-namespace Systemd \
|
||||
--generate-c-code $(builddir)/lib/xdg-app-systemd-dbus \
|
||||
$(srcdir)/data/org.freedesktop.systemd1.xml \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_la_SOURCES = \
|
||||
lib/xdg-app-dir.c \
|
||||
lib/xdg-app-dir.h \
|
||||
lib/xdg-app-run.c \
|
||||
lib/xdg-app-run.h \
|
||||
lib/xdg-app-error.c \
|
||||
lib/xdg-app-error.h \
|
||||
lib/xdg-app-utils.c \
|
||||
lib/xdg-app-utils.h \
|
||||
lib/xdg-app-chain-input-stream.c \
|
||||
lib/xdg-app-chain-input-stream.h \
|
||||
lib/gvdb/gvdb-reader.h \
|
||||
lib/gvdb/gvdb-format.h \
|
||||
lib/gvdb/gvdb-reader.c \
|
||||
lib/gvdb/gvdb-builder.h \
|
||||
lib/gvdb/gvdb-builder.c \
|
||||
lib/xdg-app-db.c \
|
||||
lib/xdg-app-db.h \
|
||||
$(dbus_built_sources) \
|
||||
$(systemd_dbus_built_sources) \
|
||||
$(NULL)
|
||||
|
||||
libxdgapp_la_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(XAUTH_CFLAGS) -I$(srcdir)/dbus-proxy
|
||||
libxdgapp_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(XAUTH_LIBS)
|
||||
|
||||
bin_PROGRAMS += \
|
||||
xdg-app-helper \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_helper_SOURCES = lib/xdg-app-helper.c
|
||||
xdg_app_helper_LDADD = $(LIBSECCOMP_LIBS)
|
||||
xdg_app_helper_CFLAGS = $(LIBSECCOMP_CFLAGS)
|
||||
|
||||
install-exec-hook:
|
||||
if DISABLE_USERNS
|
||||
if PRIV_MODE_SETUID
|
||||
$(SUDO_BIN) chown root $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
$(SUDO_BIN) chmod u+s $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
else
|
||||
if PRIV_MODE_FILECAPS
|
||||
$(SUDO_BIN) setcap cap_sys_admin+ep $(DESTDIR)$(bindir)/xdg-app-helper
|
||||
endif
|
||||
endif
|
||||
endif
|
|
@ -26,5 +26,5 @@ xdg_app_session_helper_SOURCES = \
|
|||
session-helper/xdg-app-resources.c \
|
||||
$(NULL)
|
||||
|
||||
xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp.la
|
||||
xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp-common.la
|
||||
xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS)
|
||||
|
|
|
@ -4,7 +4,7 @@ testdb_LDADD = \
|
|||
$(BASE_LIBS) \
|
||||
$(OSTREE_LIBS) \
|
||||
libglnx.la \
|
||||
libxdgapp.la \
|
||||
libxdgapp-common.la \
|
||||
$(NULL)
|
||||
testdb_SOURCES = tests/testdb.c
|
||||
|
||||
|
@ -13,7 +13,7 @@ test_doc_portal_LDADD = \
|
|||
$(BASE_LIBS) \
|
||||
$(OSTREE_LIBS) \
|
||||
libglnx.la \
|
||||
libxdgapp.la \
|
||||
libxdgapp-common.la \
|
||||
$(NULL)
|
||||
test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources)
|
||||
|
||||
|
|
Loading…
Reference in New Issue