From 08bb8398e0d218daaefdfe95c44940e370802508 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 11 Jul 2023 21:28:01 -0400 Subject: Allow building all applets in or out of process *Use --enable-in-process selector for in-process builds *Accessx-status: mark as incompatable with wayland *Accessx-status: Fix in-process runtime warning *Stickynote, Geyes: style fixes --- trashapplet/src/Makefile.am | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'trashapplet/src/Makefile.am') diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 1cad7acd..6cb5ef0a 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -4,31 +4,46 @@ AM_CPPFLAGS = -I$(top_srcdir) \ -DGRESOURCE=\""/org/mate/mate-applets/trash/\"" \ ${WARN_CFLAGS} -trashapplet_libdir= $(pkglibdir) -trashapplet_lib_LTLIBRARIES=libtrashapplet.la - -libtrashapplet_la_SOURCES = \ - trashapplet.c \ - trash-empty.h \ - trash-empty.c \ - xstuff.c \ - xstuff.h \ - trashapplet-resources.c \ - trashapplet-resources.h \ +BUILT_SOURCES = \ + trashapplet-resources.c \ + trashapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + trashapplet.c \ + trash-empty.h \ + trash-empty.c \ + xstuff.c \ + xstuff.h \ $(NULL) -libtrashapplet_la_LIBADD = \ - $(MATE_APPLETS4_LIBS) \ - $(GIO_LIBS) \ +APPLET_LIBS = \ + $(MATE_APPLETS4_LIBS) \ + $(GIO_LIBS) \ -lX11 +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-trash-applet.la +nodist_libmate_trash_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_trash_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_trash_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_trash_applet_la_LDFLAGS = -module -avoid-version +libmate_trash_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = trashapplet +nodist_trashapplet_SOURCES = $(BUILT_SOURCES) +trashapplet_SOURCES = $(APPLET_SOURCES) +trashapplet_CFLAGS = $(AM_CFLAGS) +trashapplet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< -CLEANFILES = \ +CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk -- cgit v1.2.1