diff options
| author | lukefromdc <[email protected]> | 2023-06-19 01:17:11 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 6363c16faf18cc5780bdcb9d53420a583a6482e7 (patch) | |
| tree | d7695f7c00abf8aca11cbcf412ea62a2870e66b9 /charpick/Makefile.am | |
| parent | 41458272ba8e4a01c5ce6a5e0b74d17a7ad80535 (diff) | |
| download | mate-applets-6363c16faf18cc5780bdcb9d53420a583a6482e7.tar.bz2 mate-applets-6363c16faf18cc5780bdcb9d53420a583a6482e7.tar.xz | |
charpick: port to in-process for wayland compatability
*No change in x11 behavior
*Applet works in wayland but gtk-enable-primary-paste does not
at least not in wayfire. Seems to forcibly turn off the gsettings
preference at least some of the time as well. This however is
probably an issue for a future wayland session manager to deal with
Diffstat (limited to 'charpick/Makefile.am')
| -rw-r--r-- | charpick/Makefile.am | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 1c505e20..a9665974 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -1,7 +1,12 @@ NULL = +APPLET_LOCATION = $(libdir)/mate-applets/libmate-charpick-applet.so + SUBDIRS = help +mate_charpick_applet_libdir= $(pkglibdir) +mate_charpick_applet_lib_LTLIBRARIES=libmate-charpick-applet.la + AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ @@ -11,17 +16,15 @@ AM_CPPFLAGS = \ $(GUCHARMAP_CFLAGS) \ $(NULL) -libexec_PROGRAMS = mate-charpick-applet - -BUILT_SOURCES = charpick-resources.c charpick-resources.h -nodist_mate_charpick_applet_SOURCES = $(BUILT_SOURCES) -mate_charpick_applet_SOURCES = \ +libmate_charpick_applet_la_SOURCES = \ charpick.c \ charpick.h \ properties.c \ + charpick-resources.c \ + charpick-resources.h \ $(NULL) -mate_charpick_applet_LDADD = \ +libmate_charpick_applet_la_LIBADD = \ $(MATE_APPLETS4_LIBS) \ $(GUCHARMAP_LIBS) \ $(NULL) @@ -38,22 +41,13 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-ap $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ - $< > $@ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ + $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -61,15 +55,12 @@ gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ - $(BUILT_SOURCES) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(service_in_files) \ $(charpick_gschema_in_files) \ charpick-applet-menu.xml \ charpick-resources.gresource.xml \ |