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 --- timerapplet/src/Makefile.am | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'timerapplet/src/Makefile.am') diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am index 5341cc16..75688baa 100644 --- a/timerapplet/src/Makefile.am +++ b/timerapplet/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_timer_applet_libdir= $(pkglibdir) -mate_timer_applet_lib_LTLIBRARIES=libmate-timer-applet.la - AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -10,18 +7,35 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libmate_timer_applet_la_SOURCES = \ - timerapplet.c \ - timerapplet-resources.c \ - timerapplet-resources.h \ +AM_CFLAGS = $(WARN_CFLAGS) + +BUILT_SOURCES = \ + timerapplet-resources.c \ + timerapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + timerapplet.c \ $(NULL) -libmate_timer_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(NULL) -libmate_timer_applet_la_CFLAGS = $(WARN_CFLAGS) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-timer-applet.la +nodist_libmate_timer_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_timer_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_timer_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_timer_applet_la_LDFLAGS = -module -avoid-version +libmate_timer_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = timer-applet +nodist_timer_applet_SOURCES = $(BUILT_SOURCES) +timer_applet_SOURCES = $(APPLET_SOURCES) +timer_applet_CFLAGS = $(AM_CFLAGS) +timer_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS timerapplet-resources.c: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< @@ -30,6 +44,7 @@ timerapplet-resources.h: $(srcdir)/../data/timerapplet-resources.gresource.xml $ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk -- cgit v1.2.1