diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-07-25 09:23:02 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2016-07-28 21:15:37 +0100 |
| commit | a0c98a084263ba724466b2a46dbca5793543e499 (patch) | |
| tree | cc93031321b3bea50b97b36f8d7ef51288c84e6c /libgnomekbd | |
| parent | f2939ecf4bb3af9e128d5f27ac3efa49520e9831 (diff) | |
| download | libgnomekbd-a0c98a084263ba724466b2a46dbca5793543e499.tar.gz | |
Use upstream gettext instead intltool
Diffstat (limited to 'libgnomekbd')
| -rw-r--r-- | libgnomekbd/Makefile.am | 30 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-keyboard-display.desktop.in.in | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am index 6246760..3609998 100644 --- a/libgnomekbd/Makefile.am +++ b/libgnomekbd/Makefile.am @@ -13,9 +13,6 @@ icons_DATA = kbdled-caps-lock.svg \ gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \ org.gnome.libgnomekbd.keyboard.gschema.xml \ org.gnome.libgnomekbd.gschema.xml -@GSETTINGS_RULES@ - -@INTLTOOL_XML_NOMERGE_RULE@ common_CFLAGS = \ -I$(top_srcdir) \ @@ -87,15 +84,12 @@ BUILT_SOURCES = gkbd-indicator-marshal.c \ gkbd-keyboard-drawing-marshal.h DISTCLEANFILES = $(BUILT_SOURCES) \ - $(gsettings_SCHEMAS) \ - gkbd-keyboard-display.desktop \ - gkbd-keyboard-display.desktop.in - + $(desktop_DATA) MAINTAINERCLEANFILES = \ + $(desktop_DATA) \ *~ \ - Makefile.in \ - $(gsettings_SCHEMAS:.xml=.valid) + Makefile.in gnomekbdincdir = $(includedir)/libgnomekbd gnomekbdinc_HEADERS = \ @@ -108,11 +102,17 @@ gnomekbdinc_HEADERS = \ gkbd-keyboard-drawing.h \ gkbd-util.h -sysdir = $(datadir)/applications -sys_in_in_files = gkbd-keyboard-display.desktop.in.in -sys_DATA = $(sys_in_in_files:.desktop.in.in=.desktop) +# Rule to create the .desktop files +desktopdir = $(datadir)/applications +desktop_in_files = gkbd-keyboard-display.desktop.in +desktop_DATA = gkbd-keyboard-display.desktop + +$(desktop_in_files): gkbd-keyboard-display.desktop.in.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ -@INTLTOOL_DESKTOP_RULE@ +# Substitute variables in a Desktop Entry file. +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@ noinst_HEADERS = $(extra_nih) \ gkbd-config-private.h @@ -125,8 +125,8 @@ EXTRA_DIST = gkbd-indicator-marshal.list \ $(ui_DATA) \ $(convert_DATA) \ $(icons_DATA) \ - $(sys_in_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in.in) + $(desktop_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) diff --git a/libgnomekbd/gkbd-keyboard-display.desktop.in.in b/libgnomekbd/gkbd-keyboard-display.desktop.in.in index 2fe92dc..656fa6d 100644 --- a/libgnomekbd/gkbd-keyboard-display.desktop.in.in +++ b/libgnomekbd/gkbd-keyboard-display.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Keyboard Layout -_Comment=Preview keyboard layouts +Name=Keyboard Layout +Comment=Preview keyboard layouts Icon=preferences-desktop-keyboard Exec=gkbd-keyboard-display Terminal=false |