From a344e2b0f7e9101dc82c2e2cfcf219772a497822 Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 4 Apr 2019 10:56:55 +0200 Subject: Use the Automake variable nobase_dist_icons_DATA nobase_dist_icons_DATA: nobase: It tells that the files have same directory structure as the installed on system dist: It tells that the files should be included in the distribution tarball icons: It tells where to install the files DATA: It tells that they are data files, and they do not need to be compiled --- data/icons/24x24/Makefile.am | 3 --- data/icons/24x24/actions/Makefile.am | 17 ----------------- data/icons/24x24/apps/Makefile.am | 27 --------------------------- 3 files changed, 47 deletions(-) delete mode 100644 data/icons/24x24/Makefile.am delete mode 100644 data/icons/24x24/actions/Makefile.am delete mode 100644 data/icons/24x24/apps/Makefile.am (limited to 'data/icons/24x24') diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am deleted file mode 100644 index 4497479..0000000 --- a/data/icons/24x24/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = actions apps - --include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am deleted file mode 100644 index 0af6b6f..0000000 --- a/data/icons/24x24/actions/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -themedir = $(pkgdatadir)/icons/hicolor -size = 24x24 -context = actions - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - add-files-to-archive.png \ - add-folder-to-archive.png \ - extract-archive.png - -noinst_DATA = - -EXTRA_DIST = \ - $(icons_DATA) \ - $(noinst_DATA) --include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am deleted file mode 100644 index a4be694..0000000 --- a/data/icons/24x24/apps/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 24x24 -context = apps - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - engrampa.png - -noinst_DATA = - -EXTRA_DIST = \ - $(icons_DATA) \ - $(noinst_DATA) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - --include $(top_srcdir)/git.mk -- cgit v1.2.1