From 302f88e69da195ee44d5809a7355320f0072b47e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 9 Jul 2015 18:16:44 +0200 Subject: [PATCH] Restructure directories and build This moves a all source code into separate subdirs per binary. The helper and the generic stuff goes into lib/ which is then used by all the others. For now this is a completely internal library, but at some point we will probably clean it up and expose some subset. Also, we move the dbus proxy to libexecdir. --- .gitignore | 3 + Makefile.am | 142 +++--------------- app/Makefile.am.inc | 27 ++++ .../xdg-app-builtins-add-remote.c | 0 .../xdg-app-builtins-build-export.c | 0 .../xdg-app-builtins-build-finish.c | 0 .../xdg-app-builtins-build-init.c | 0 .../xdg-app-builtins-build.c | 0 .../xdg-app-builtins-delete-remote.c | 0 .../xdg-app-builtins-install.c | 0 .../xdg-app-builtins-list-remotes.c | 0 .../xdg-app-builtins-list.c | 0 .../xdg-app-builtins-make-current.c | 0 .../xdg-app-builtins-repo-contents.c | 0 .../xdg-app-builtins-repo-update.c | 0 .../xdg-app-builtins-run.c | 2 +- .../xdg-app-builtins-uninstall.c | 0 .../xdg-app-builtins-update.c | 0 xdg-app-builtins.h => app/xdg-app-builtins.h | 0 xdg-app-main.c => app/xdg-app-main.c | 0 configure.ac | 2 +- .../org.freedesktop.systemd1.xml | 0 .../xdg-app-dbus-interfaces.xml | 0 dbus-proxy/Makefile.am.inc | 12 ++ dbus-proxy.c => dbus-proxy/dbus-proxy.c | 0 xdg-app-proxy.c => dbus-proxy/xdg-app-proxy.c | 0 xdg-app-proxy.h => dbus-proxy/xdg-app-proxy.h | 0 lib/Makefile.am.inc | 55 +++++++ xdg-app-dir.c => lib/xdg-app-dir.c | 0 xdg-app-dir.h => lib/xdg-app-dir.h | 0 xdg-app-helper.c => lib/xdg-app-helper.c | 0 xdg-app-run.c => lib/xdg-app-run.c | 0 xdg-app-run.h => lib/xdg-app-run.h | 0 xdg-app-utils.c => lib/xdg-app-utils.c | 0 xdg-app-utils.h => lib/xdg-app-utils.h | 0 session-helper/Makefile.am.inc | 33 ++++ .../xdg-app-session-helper.c | 0 .../xdg-app-session.service.in | 0 .../xdg-app.gresource.xml | 2 +- 39 files changed, 153 insertions(+), 125 deletions(-) create mode 100644 app/Makefile.am.inc rename xdg-app-builtins-add-remote.c => app/xdg-app-builtins-add-remote.c (100%) rename xdg-app-builtins-build-export.c => app/xdg-app-builtins-build-export.c (100%) rename xdg-app-builtins-build-finish.c => app/xdg-app-builtins-build-finish.c (100%) rename xdg-app-builtins-build-init.c => app/xdg-app-builtins-build-init.c (100%) rename xdg-app-builtins-build.c => app/xdg-app-builtins-build.c (100%) rename xdg-app-builtins-delete-remote.c => app/xdg-app-builtins-delete-remote.c (100%) rename xdg-app-builtins-install.c => app/xdg-app-builtins-install.c (100%) rename xdg-app-builtins-list-remotes.c => app/xdg-app-builtins-list-remotes.c (100%) rename xdg-app-builtins-list.c => app/xdg-app-builtins-list.c (100%) rename xdg-app-builtins-make-current.c => app/xdg-app-builtins-make-current.c (100%) rename xdg-app-builtins-repo-contents.c => app/xdg-app-builtins-repo-contents.c (100%) rename xdg-app-builtins-repo-update.c => app/xdg-app-builtins-repo-update.c (100%) rename xdg-app-builtins-run.c => app/xdg-app-builtins-run.c (99%) rename xdg-app-builtins-uninstall.c => app/xdg-app-builtins-uninstall.c (100%) rename xdg-app-builtins-update.c => app/xdg-app-builtins-update.c (100%) rename xdg-app-builtins.h => app/xdg-app-builtins.h (100%) rename xdg-app-main.c => app/xdg-app-main.c (100%) rename org.freedesktop.systemd1.xml => data/org.freedesktop.systemd1.xml (100%) rename xdg-app-dbus-interfaces.xml => data/xdg-app-dbus-interfaces.xml (100%) create mode 100644 dbus-proxy/Makefile.am.inc rename dbus-proxy.c => dbus-proxy/dbus-proxy.c (100%) rename xdg-app-proxy.c => dbus-proxy/xdg-app-proxy.c (100%) rename xdg-app-proxy.h => dbus-proxy/xdg-app-proxy.h (100%) create mode 100644 lib/Makefile.am.inc rename xdg-app-dir.c => lib/xdg-app-dir.c (100%) rename xdg-app-dir.h => lib/xdg-app-dir.h (100%) rename xdg-app-helper.c => lib/xdg-app-helper.c (100%) rename xdg-app-run.c => lib/xdg-app-run.c (100%) rename xdg-app-run.h => lib/xdg-app-run.h (100%) rename xdg-app-utils.c => lib/xdg-app-utils.c (100%) rename xdg-app-utils.h => lib/xdg-app-utils.h (100%) create mode 100644 session-helper/Makefile.am.inc rename xdg-app-session-helper.c => session-helper/xdg-app-session-helper.c (100%) rename xdg-app-session.service.in => session-helper/xdg-app-session.service.in (100%) rename xdg-app.gresource.xml => session-helper/xdg-app.gresource.xml (59%) diff --git a/.gitignore b/.gitignore index d79b2503..65f36d4b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ xdg-app-systemd-dbus.[ch] xdg-app-resources.[ch] xdg-dbus-proxy *.service +xdg-app.env +xdg-app.sh + diff --git a/Makefile.am b/Makefile.am index 97ae1163..0c235a7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,9 @@ NULL = +bin_PROGRAMS = $(NULL) +libexec_PROGRAMS = $(NULL) +DISTCLEANFILES= $(NULL) + if BUILD_DOCUMENTATION SUBDIRS = doc endif @@ -11,6 +15,10 @@ AM_CPPFLAGS = \ -DXDG_APP_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \ -DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \ -DHELPER=\"$(bindir)/xdg-app-helper\" \ + -DDBUSPROXY=\"$(libexecdir)/xdg-dbus-proxy\" \ + -I$(srcdir)/libglnx \ + -I$(srcdir)/lib \ + -I$(builddir)/lib \ $(NULL) triggersdir = $(pkgdatadir)/triggers @@ -20,130 +28,18 @@ dist_triggers_SCRIPTS = \ triggers/desktop-database.trigger \ $(NULL) -bin_PROGRAMS = \ - xdg-app-helper \ - xdg-dbus-proxy \ - xdg-app \ - $(NULL) - -libexec_PROGRAMS = \ - xdg-app-session-helper \ - $(NULL) - -EXTRA_DIST = xdg-app.gresource.xml xdg-app-dbus-interfaces.xml org.freedesktop.systemd1.xml +EXTRA_DIST = data/xdg-app-dbus-interfaces.xml data/org.freedesktop.systemd1.xml +noinst_LTLIBRARIES = libglnx.la libglnx_srcpath := $(srcdir)/libglnx libglnx_cflags := $(BASE_CFLAGS) "-I$(libglnx_srcpath)" libglnx_libs := $(BASE_LIBS) include libglnx/Makefile-libglnx.am.inc -noinst_LTLIBRARIES = libglnx.la - -xdg_app_helper_SOURCES = xdg-app-helper.c -xdg_app_helper_LDADD = $(LIBSECCOMP_LIBS) -xdg_app_helper_CFLAGS = $(LIBSECCOMP_CFLAGS) - -dbus_built_sources = xdg-app-dbus.c xdg-app-dbus.h -systemd_dbus_built_sources = xdg-app-systemd-dbus.c xdg-app-systemd-dbus.h -BUILT_SOURCES = $(dbus_built_sources) $(systemd_dbus_built_sources) - -$(dbus_built_sources) : Makefile.am xdg-app-dbus-interfaces.xml - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.XdgApp. \ - --c-namespace XdgApp \ - --generate-c-code xdg-app-dbus \ - $(srcdir)/xdg-app-dbus-interfaces.xml \ - $(NULL) - -$(systemd_dbus_built_sources) : Makefile.am org.freedesktop.systemd1.xml - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.systemd1. \ - --c-namespace Systemd \ - --generate-c-code xdg-app-systemd-dbus \ - $(srcdir)/org.freedesktop.systemd1.xml \ - $(NULL) - -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/xdg-app.gresource.xml) - -xdg-app-resources.h: xdg-app.gresource.xml - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header - -xdg-app-resources.c: xdg-app.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source - -# D-BUS service file -%.service: %.service.in config.log - $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -servicedir = $(DBUS_SERVICE_DIR) -service_in_files = xdg-app-session.service.in -service_DATA = xdg-app-session.service - -EXTRA_DIST += $(service_in_files) - -xdg_app_session_helper_SOURCES = \ - xdg-app-session-helper.c \ - $(dbus_built_sources) \ - xdg-app-resources.h \ - xdg-app-resources.c \ - $(NULL) - -xdg_app_session_helper_LDADD = $(BASE_LIBS) -xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS) - -xdg_app_SOURCES = \ - xdg-app-main.c \ - xdg-app-builtins.h \ - xdg-app-builtins-add-remote.c \ - xdg-app-builtins-delete-remote.c \ - xdg-app-builtins-list-remotes.c \ - xdg-app-builtins-repo-contents.c \ - xdg-app-builtins-install.c \ - xdg-app-builtins-make-current.c \ - xdg-app-builtins-update.c \ - xdg-app-builtins-uninstall.c \ - xdg-app-builtins-list.c \ - xdg-app-builtins-run.c \ - xdg-app-builtins-build-init.c \ - xdg-app-builtins-build.c \ - xdg-app-builtins-build-finish.c \ - xdg-app-builtins-build-export.c \ - xdg-app-builtins-repo-update.c \ - xdg-app-dir.c \ - xdg-app-dir.h \ - xdg-app-run.c \ - xdg-app-run.h \ - xdg-app-utils.h \ - xdg-app-utils.c \ - $(systemd_dbus_built_sources) \ - $(dbus_built_sources) \ - $(NULL) - -xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) libglnx.la -xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) -I$(srcdir)/libglnx - -xdg_dbus_proxy_SOURCES = \ - xdg-app-proxy.c \ - xdg-app-proxy.h \ - dbus-proxy.c \ - $(NULL) - -xdg_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la -xdg_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/libglnx - -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 +include lib/Makefile.am.inc +include app/Makefile.am.inc +include session-helper/Makefile.am.inc +include dbus-proxy/Makefile.am.inc completiondir = $(datadir)/bash-completion/completions completion_DATA = completion/xdg-app @@ -152,15 +48,17 @@ EXTRA_DIST += $(completion_DATA) profiledir = $(sysconfdir)/profile.d profile_DATA = xdg-app.sh EXTRA_DIST += profile/xdg-app.sh.in - -envdir = $(datadir)/gdm/env.d -env_DATA = xdg-app.env -EXTRA_DIST += env.d/xdg-app.env.in +DISTCLEANFILES += xdg-app.sh xdg-app.sh: profile/xdg-app.sh.in $(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ +envdir = $(datadir)/gdm/env.d +env_DATA = xdg-app.env +EXTRA_DIST += env.d/xdg-app.env.in +DISTCLEANFILES += xdg-app.env + xdg-app.env: env.d/xdg-app.env.in $(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \ -e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@ diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc new file mode 100644 index 00000000..bba4724d --- /dev/null +++ b/app/Makefile.am.inc @@ -0,0 +1,27 @@ +bin_PROGRAMS += \ + xdg-app \ + $(NULL) + +xdg_app_SOURCES = \ + app/xdg-app-main.c \ + app/xdg-app-builtins.h \ + app/xdg-app-builtins-add-remote.c \ + app/xdg-app-builtins-delete-remote.c \ + app/xdg-app-builtins-list-remotes.c \ + app/xdg-app-builtins-repo-contents.c \ + app/xdg-app-builtins-install.c \ + app/xdg-app-builtins-make-current.c \ + app/xdg-app-builtins-update.c \ + app/xdg-app-builtins-uninstall.c \ + app/xdg-app-builtins-list.c \ + app/xdg-app-builtins-run.c \ + app/xdg-app-builtins-build-init.c \ + app/xdg-app-builtins-build.c \ + app/xdg-app-builtins-build-finish.c \ + app/xdg-app-builtins-build-export.c \ + app/xdg-app-builtins-repo-update.c \ + $(NULL) + +xdg_app_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) libglnx.la libxdgapp.la +xdg_app_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) + diff --git a/xdg-app-builtins-add-remote.c b/app/xdg-app-builtins-add-remote.c similarity index 100% rename from xdg-app-builtins-add-remote.c rename to app/xdg-app-builtins-add-remote.c diff --git a/xdg-app-builtins-build-export.c b/app/xdg-app-builtins-build-export.c similarity index 100% rename from xdg-app-builtins-build-export.c rename to app/xdg-app-builtins-build-export.c diff --git a/xdg-app-builtins-build-finish.c b/app/xdg-app-builtins-build-finish.c similarity index 100% rename from xdg-app-builtins-build-finish.c rename to app/xdg-app-builtins-build-finish.c diff --git a/xdg-app-builtins-build-init.c b/app/xdg-app-builtins-build-init.c similarity index 100% rename from xdg-app-builtins-build-init.c rename to app/xdg-app-builtins-build-init.c diff --git a/xdg-app-builtins-build.c b/app/xdg-app-builtins-build.c similarity index 100% rename from xdg-app-builtins-build.c rename to app/xdg-app-builtins-build.c diff --git a/xdg-app-builtins-delete-remote.c b/app/xdg-app-builtins-delete-remote.c similarity index 100% rename from xdg-app-builtins-delete-remote.c rename to app/xdg-app-builtins-delete-remote.c diff --git a/xdg-app-builtins-install.c b/app/xdg-app-builtins-install.c similarity index 100% rename from xdg-app-builtins-install.c rename to app/xdg-app-builtins-install.c diff --git a/xdg-app-builtins-list-remotes.c b/app/xdg-app-builtins-list-remotes.c similarity index 100% rename from xdg-app-builtins-list-remotes.c rename to app/xdg-app-builtins-list-remotes.c diff --git a/xdg-app-builtins-list.c b/app/xdg-app-builtins-list.c similarity index 100% rename from xdg-app-builtins-list.c rename to app/xdg-app-builtins-list.c diff --git a/xdg-app-builtins-make-current.c b/app/xdg-app-builtins-make-current.c similarity index 100% rename from xdg-app-builtins-make-current.c rename to app/xdg-app-builtins-make-current.c diff --git a/xdg-app-builtins-repo-contents.c b/app/xdg-app-builtins-repo-contents.c similarity index 100% rename from xdg-app-builtins-repo-contents.c rename to app/xdg-app-builtins-repo-contents.c diff --git a/xdg-app-builtins-repo-update.c b/app/xdg-app-builtins-repo-update.c similarity index 100% rename from xdg-app-builtins-repo-update.c rename to app/xdg-app-builtins-repo-update.c diff --git a/xdg-app-builtins-run.c b/app/xdg-app-builtins-run.c similarity index 99% rename from xdg-app-builtins-run.c rename to app/xdg-app-builtins-run.c index de9d0f04..9ece439b 100644 --- a/xdg-app-builtins-run.c +++ b/app/xdg-app-builtins-run.c @@ -337,7 +337,7 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError ** goto out; } - g_ptr_array_insert (dbus_proxy_argv, 0, g_strdup ("xdg-dbus-proxy")); + g_ptr_array_insert (dbus_proxy_argv, 0, g_strdup (DBUSPROXY)); g_ptr_array_insert (dbus_proxy_argv, 1, g_strdup_printf ("--fd=%d", sync_proxy_pipes[1])); g_ptr_array_add (dbus_proxy_argv, NULL); /* NULL terminate */ diff --git a/xdg-app-builtins-uninstall.c b/app/xdg-app-builtins-uninstall.c similarity index 100% rename from xdg-app-builtins-uninstall.c rename to app/xdg-app-builtins-uninstall.c diff --git a/xdg-app-builtins-update.c b/app/xdg-app-builtins-update.c similarity index 100% rename from xdg-app-builtins-update.c rename to app/xdg-app-builtins-update.c diff --git a/xdg-app-builtins.h b/app/xdg-app-builtins.h similarity index 100% rename from xdg-app-builtins.h rename to app/xdg-app-builtins.h diff --git a/xdg-app-main.c b/app/xdg-app-main.c similarity index 100% rename from xdg-app-main.c rename to app/xdg-app-main.c diff --git a/configure.ac b/configure.ac index 6b037bb2..e95d9211 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_DISABLE_STATIC LT_PREREQ([2.2.6]) LT_INIT([disable-static]) -AC_CONFIG_SRCDIR([xdg-app-helper.c]) +AC_CONFIG_SRCDIR([lib/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]) diff --git a/org.freedesktop.systemd1.xml b/data/org.freedesktop.systemd1.xml similarity index 100% rename from org.freedesktop.systemd1.xml rename to data/org.freedesktop.systemd1.xml diff --git a/xdg-app-dbus-interfaces.xml b/data/xdg-app-dbus-interfaces.xml similarity index 100% rename from xdg-app-dbus-interfaces.xml rename to data/xdg-app-dbus-interfaces.xml diff --git a/dbus-proxy/Makefile.am.inc b/dbus-proxy/Makefile.am.inc new file mode 100644 index 00000000..42bf93db --- /dev/null +++ b/dbus-proxy/Makefile.am.inc @@ -0,0 +1,12 @@ +libexec_PROGRAMS += \ + xdg-dbus-proxy \ + $(NULL) + +xdg_dbus_proxy_SOURCES = \ + dbus-proxy/xdg-app-proxy.c \ + dbus-proxy/xdg-app-proxy.h \ + dbus-proxy/dbus-proxy.c \ + $(NULL) + +xdg_dbus_proxy_LDADD = $(BASE_LIBS) libglnx.la +xdg_dbus_proxy_CFLAGS = $(BASE_CFLAGS) -I$(srcdir)/dbus-proxy diff --git a/dbus-proxy.c b/dbus-proxy/dbus-proxy.c similarity index 100% rename from dbus-proxy.c rename to dbus-proxy/dbus-proxy.c diff --git a/xdg-app-proxy.c b/dbus-proxy/xdg-app-proxy.c similarity index 100% rename from xdg-app-proxy.c rename to dbus-proxy/xdg-app-proxy.c diff --git a/xdg-app-proxy.h b/dbus-proxy/xdg-app-proxy.h similarity index 100% rename from xdg-app-proxy.h rename to dbus-proxy/xdg-app-proxy.h diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc new file mode 100644 index 00000000..319f5ed0 --- /dev/null +++ b/lib/Makefile.am.inc @@ -0,0 +1,55 @@ +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/xdg-app-dbus-interfaces.xml + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.XdgApp. \ + --c-namespace XdgApp \ + --generate-c-code $(builddir)/lib/xdg-app-dbus \ + $(srcdir)/data/xdg-app-dbus-interfaces.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-utils.c \ + lib/xdg-app-utils.h \ + $(dbus_built_sources) \ + $(systemd_dbus_built_sources) \ + $(NULL) + +libxdgapp_la_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) -I$(srcdir)/dbus-proxy +libxdgapp_la_LIBADD = libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_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 diff --git a/xdg-app-dir.c b/lib/xdg-app-dir.c similarity index 100% rename from xdg-app-dir.c rename to lib/xdg-app-dir.c diff --git a/xdg-app-dir.h b/lib/xdg-app-dir.h similarity index 100% rename from xdg-app-dir.h rename to lib/xdg-app-dir.h diff --git a/xdg-app-helper.c b/lib/xdg-app-helper.c similarity index 100% rename from xdg-app-helper.c rename to lib/xdg-app-helper.c diff --git a/xdg-app-run.c b/lib/xdg-app-run.c similarity index 100% rename from xdg-app-run.c rename to lib/xdg-app-run.c diff --git a/xdg-app-run.h b/lib/xdg-app-run.h similarity index 100% rename from xdg-app-run.h rename to lib/xdg-app-run.h diff --git a/xdg-app-utils.c b/lib/xdg-app-utils.c similarity index 100% rename from xdg-app-utils.c rename to lib/xdg-app-utils.c diff --git a/xdg-app-utils.h b/lib/xdg-app-utils.h similarity index 100% rename from xdg-app-utils.h rename to lib/xdg-app-utils.h diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc new file mode 100644 index 00000000..e6b438ba --- /dev/null +++ b/session-helper/Makefile.am.inc @@ -0,0 +1,33 @@ +resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/session-helper/xdg-app.gresource.xml) + +libexec_PROGRAMS += \ + xdg-app-session-helper \ + $(NULL) + +session-helper/xdg-app-resources.h: session-helper/xdg-app.gresource.xml + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ + --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header + +session-helper/xdg-app-resources.c: session-helper/xdg-app.gresource.xml $(resource_files) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ + --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source + +# D-BUS service file +%.service: %.service.in config.log + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +servicedir = $(DBUS_SERVICE_DIR) +service_in_files = session-helper/xdg-app-session.service.in +service_DATA = session-helper/xdg-app-session.service +DISTCLEANFILES += $(service_DATA) + +EXTRA_DIST += session-helper/xdg-app.gresource.xml $(service_in_files) + +xdg_app_session_helper_SOURCES = \ + session-helper/xdg-app-session-helper.c \ + session-helper/xdg-app-resources.h \ + session-helper/xdg-app-resources.c \ + $(NULL) + +xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp.la +xdg_app_session_helper_CFLAGS = $(BASE_CFLAGS) diff --git a/xdg-app-session-helper.c b/session-helper/xdg-app-session-helper.c similarity index 100% rename from xdg-app-session-helper.c rename to session-helper/xdg-app-session-helper.c diff --git a/xdg-app-session.service.in b/session-helper/xdg-app-session.service.in similarity index 100% rename from xdg-app-session.service.in rename to session-helper/xdg-app-session.service.in diff --git a/xdg-app.gresource.xml b/session-helper/xdg-app.gresource.xml similarity index 59% rename from xdg-app.gresource.xml rename to session-helper/xdg-app.gresource.xml index 4887a94a..c3d3e494 100644 --- a/xdg-app.gresource.xml +++ b/session-helper/xdg-app.gresource.xml @@ -1,6 +1,6 @@ - xdg-app-dbus-interfaces.xml + data/xdg-app-dbus-interfaces.xml