diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /stickynotes/Makefile.am | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
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
Diffstat (limited to 'stickynotes/Makefile.am')
| -rw-r--r-- | stickynotes/Makefile.am | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index 2057f587..6f51c130 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -1,11 +1,7 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-stickynotes-applet.so - SUBDIRS = pixmaps docs -mate_stickynotes_applet_libdir= $(pkglibdir) -mate_stickynotes_applet_lib_LTLIBRARIES=libmate-stickynotes-applet.la applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in service_in_files = org.mate.panel.applet.StickyNotesAppletFactory.service.in schemas_in_files = stickynotes.schemas.in @@ -22,7 +18,11 @@ AM_CPPFLAGS = \ ${WARN_CFLAGS} \ $(NULL) -libmate_stickynotes_applet_la_SOURCES = \ +BUILT_SOURCES = \ + sticky-notes-resources.c \ + sticky-notes-resources.h \ + $(NULL) +APPLET_SOURCES = \ util.h \ util.c \ stickynotes.h \ @@ -33,11 +33,9 @@ libmate_stickynotes_applet_la_SOURCES = \ stickynotes_callbacks.c \ stickynotes_applet.c \ stickynotes_applet_callbacks.c \ - sticky-notes-resources.c \ - sticky-notes-resources.h \ $(NULL) -libmate_stickynotes_applet_la_LIBADD = \ +APPLET_LIBS = \ $(STICKYNOTES_LIBS) \ $(MATE_APPLETS4_LIBS) \ $(LIBWNCK_LIBS) \ @@ -45,6 +43,31 @@ libmate_stickynotes_applet_la_LIBADD = \ -lX11 \ $(NULL) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-stickynotes-applet.so +pkglib_LTLIBRARIES = libmate-stickynotes-applet.la +nodist_libmate_stickynotes_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_stickynotes_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_stickynotes_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_stickynotes_applet_la_LDFLAGS = -module -avoid-version +libmate_stickynotes_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/stickynotes-applet +libexec_PROGRAMS = stickynotes-applet +nodist_stickynotes_applet_SOURCES = $(BUILT_SOURCES) +stickynotes_applet_SOURCES = $(APPLET_SOURCES) +stickynotes_applet_CFLAGS = $(AM_CFLAGS) +stickynotes_applet_LDADD = $(APPLET_LIBS) + +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -61,6 +84,7 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet $(applet_in_files): $(applet_in_files:=.in) Makefile $(AM_V_GEN)sed \ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ @@ -70,16 +94,19 @@ $(applet_DATA): $(applet_in_files) Makefile CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ sticky-notes-resources.c \ sticky-notes-resources.h \ *.gschema.valid \ + $(BUILT_SOURCES) \ $(NULL) endif EXTRA_DIST = \ $(stickynotes_gschema_in_files) \ + $(service_in_files) \ $(applet_in_files:=.in) \ sticky-notes-delete.ui \ sticky-notes-delete-all.ui \ |