summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2024-04-16 14:41:35 +0200
committerVictor Kareh <[email protected]>2024-04-23 08:51:53 -0400
commit33f05a252cd2f8f39eaa0fb6df9210c47995ac0e (patch)
treeb24990d94b8658fe83685ee0f53bcc35bc6dabc1
parentc5b2dfc82baeaa998b414fc90efcc15f11f17925 (diff)
downloadatril-master.tar.bz2
atril-master.tar.xz
Cleanup icons MakefileHEADmaster
Replace full-subdirs with a single Makefile for all icons, making things both simpler and more concise. Also, properly use Automake variable prefixes instead of doing it manually.
-rw-r--r--configure.ac26
-rw-r--r--data/icons/128x128/Makefile.am4
-rw-r--r--data/icons/128x128/apps/Makefile.am16
-rw-r--r--data/icons/16x16/Makefile.am3
-rw-r--r--data/icons/16x16/actions/Makefile.am27
-rw-r--r--data/icons/16x16/apps/Makefile.am16
-rw-r--r--data/icons/16x16/mimetypes/Makefile.am16
-rw-r--r--data/icons/22x22/Makefile.am3
-rw-r--r--data/icons/22x22/actions/Makefile.am28
-rw-r--r--data/icons/22x22/apps/Makefile.am16
-rw-r--r--data/icons/22x22/mimetypes/Makefile.am16
-rw-r--r--data/icons/24x24/Makefile.am3
-rw-r--r--data/icons/24x24/actions/Makefile.am23
-rw-r--r--data/icons/24x24/apps/Makefile.am16
-rw-r--r--data/icons/24x24/mimetypes/Makefile.am16
-rw-r--r--data/icons/32x32/Makefile.am3
-rw-r--r--data/icons/32x32/actions/Makefile.am19
-rw-r--r--data/icons/32x32/mimetypes/Makefile.am16
-rw-r--r--data/icons/48x48/Makefile.am4
-rw-r--r--data/icons/48x48/actions/Makefile.am20
-rw-r--r--data/icons/48x48/apps/Makefile.am16
-rw-r--r--data/icons/64x64/Makefile.am4
-rw-r--r--data/icons/64x64/apps/Makefile.am16
-rw-r--r--data/icons/Makefile.am64
-rw-r--r--data/icons/scalable/Makefile.am3
-rw-r--r--data/icons/scalable/actions/Makefile.am17
-rw-r--r--data/icons/scalable/apps/Makefile.am16
-rw-r--r--data/icons/scalable/mimetypes/Makefile.am16
28 files changed, 63 insertions, 380 deletions
diff --git a/configure.ac b/configure.ac
index c0e78a56..cd734add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,32 +742,6 @@ data/atril.appdata.xml.in
data/atril.desktop.in
data/Makefile
data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/16x16/mimetypes/Makefile
-data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/22x22/mimetypes/Makefile
-data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/24x24/mimetypes/Makefile
-data/icons/32x32/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/32x32/mimetypes/Makefile
-data/icons/48x48/Makefile
-data/icons/48x48/apps/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/64x64/Makefile
-data/icons/64x64/apps/Makefile
-data/icons/128x128/Makefile
-data/icons/128x128/apps/Makefile
-data/icons/scalable/Makefile
-data/icons/scalable/apps/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/mimetypes/Makefile
help/Makefile
help/reference/Makefile
help/reference/libdocument/Makefile
diff --git a/data/icons/128x128/Makefile.am b/data/icons/128x128/Makefile.am
deleted file mode 100644
index 237e2099..00000000
--- a/data/icons/128x128/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = apps
-
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/128x128/apps/Makefile.am b/data/icons/128x128/apps/Makefile.am
deleted file mode 100644
index 47dada0a..00000000
--- a/data/icons/128x128/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 128x128
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index d82ea2a3..00000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-height.png \
- zoom-fit-width.png \
- object-rotate-left.png \
- object-rotate-right.png
-
-noinst_DATA = \
- view-page-continuous.xcf \
- view-page-facing.xcf \
- zoom.svg \
- zoom-fit-page.svg \
- zoom-fit-width.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index aa82e2c4..00000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/mimetypes/Makefile.am b/data/icons/16x16/mimetypes/Makefile.am
deleted file mode 100644
index 87840e2f..00000000
--- a/data/icons/16x16/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
deleted file mode 100644
index eba54c2a..00000000
--- a/data/icons/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- eye.png \
- object-rotate-left.png \
- object-rotate-right.png \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-page.png \
- zoom-fit-width.png
-
-noinst_DATA = \
- view-page-continuous.xcf \
- view-page-facing.xcf \
- zoom.svg \
- zoom-fit-page.svg \
- zoom-fit-width.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index f7d407d3..00000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/mimetypes/Makefile.am b/data/icons/22x22/mimetypes/Makefile.am
deleted file mode 100644
index bfd92a28..00000000
--- a/data/icons/22x22/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--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 f44f8b6b..00000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- stock_filters-invert.png \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-height.png \
- zoom-fit-width.png \
- object-rotate-left.png \
- object-rotate-right.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 e23a2ba9..00000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/mimetypes/Makefile.am b/data/icons/24x24/mimetypes/Makefile.am
deleted file mode 100644
index b4025de3..00000000
--- a/data/icons/24x24/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index 02d9f743..00000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
deleted file mode 100644
index 09e20499..00000000
--- a/data/icons/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- object-rotate-left.png \
- object-rotate-right.png \
- view-page-continuous.png \
- view-page-facing.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/mimetypes/Makefile.am b/data/icons/32x32/mimetypes/Makefile.am
deleted file mode 100644
index a347c0bd..00000000
--- a/data/icons/32x32/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index ae033087..00000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = actions apps
-
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
deleted file mode 100644
index a8047edf..00000000
--- a/data/icons/48x48/actions/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- close.png \
- view-page-continuous.png \
- view-page-facing.png \
- resize-se.png \
- resize-sw.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
deleted file mode 100644
index c73ebc82..00000000
--- a/data/icons/48x48/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/64x64/Makefile.am b/data/icons/64x64/Makefile.am
deleted file mode 100644
index 237e2099..00000000
--- a/data/icons/64x64/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = apps
-
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/64x64/apps/Makefile.am b/data/icons/64x64/apps/Makefile.am
deleted file mode 100644
index 6aa2c49e..00000000
--- a/data/icons/64x64/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 64x64
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 8dcf5e07..8537a1d3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,66 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 64x64 128x128 scalable
+iconsdir = $(datadir)/icons/hicolor
+pkgiconsdir = $(pkgdatadir)/icons/hicolor
+nobase_dist_icons_DATA = \
+ 16x16/apps/atril.png \
+ 22x22/apps/atril.png \
+ 24x24/apps/atril.png \
+ 48x48/apps/atril.png \
+ 64x64/apps/atril.png \
+ 128x128/apps/atril.png \
+ scalable/apps/atril.svg
+
+nobase_dist_pkgicons_DATA = \
+ 16x16/actions/object-rotate-left.png \
+ 16x16/actions/object-rotate-right.png \
+ 16x16/actions/view-page-continuous.png \
+ 16x16/actions/view-page-facing.png \
+ 16x16/actions/zoom.png \
+ 16x16/actions/zoom-fit-height.png \
+ 16x16/actions/zoom-fit-width.png \
+ 16x16/mimetypes/x-office-presentation.png \
+ 22x22/actions/eye.png \
+ 22x22/actions/object-rotate-left.png \
+ 22x22/actions/object-rotate-right.png \
+ 22x22/actions/view-page-continuous.png \
+ 22x22/actions/view-page-facing.png \
+ 22x22/actions/zoom.png \
+ 22x22/actions/zoom-fit-page.png \
+ 22x22/actions/zoom-fit-width.png \
+ 22x22/mimetypes/x-office-presentation.png \
+ 24x24/actions/object-rotate-left.png \
+ 24x24/actions/object-rotate-right.png \
+ 24x24/actions/stock_filters-invert.png \
+ 24x24/actions/view-page-continuous.png \
+ 24x24/actions/view-page-facing.png \
+ 24x24/actions/zoom.png \
+ 24x24/actions/zoom-fit-height.png \
+ 24x24/actions/zoom-fit-width.png \
+ 24x24/mimetypes/x-office-presentation.png \
+ 32x32/actions/object-rotate-left.png \
+ 32x32/actions/object-rotate-right.png \
+ 32x32/actions/view-page-continuous.png \
+ 32x32/actions/view-page-facing.png \
+ 32x32/mimetypes/x-office-presentation.png \
+ 48x48/actions/close.png \
+ 48x48/actions/view-page-continuous.png \
+ 48x48/actions/view-page-facing.png \
+ 48x48/actions/resize-se.png \
+ 48x48/actions/resize-sw.png \
+ scalable/actions/object-rotate-left.svg \
+ scalable/actions/object-rotate-right.svg \
+ scalable/mimetypes/x-office-presentation.svg
+
+dist_noinst_DATA = \
+ 16x16/actions/view-page-continuous.xcf \
+ 16x16/actions/view-page-facing.xcf \
+ 16x16/actions/zoom.svg \
+ 16x16/actions/zoom-fit-page.svg \
+ 16x16/actions/zoom-fit-width.svg \
+ 22x22/actions/view-page-continuous.xcf \
+ 22x22/actions/view-page-facing.xcf \
+ 22x22/actions/zoom.svg \
+ 22x22/actions/zoom-fit-page.svg \
+ 22x22/actions/zoom-fit-width.svg
-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
deleted file mode 100644
index eb48907e..00000000
--- a/data/icons/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- object-rotate-left.svg \
- object-rotate-right.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index a7d6c404..00000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/mimetypes/Makefile.am b/data/icons/scalable/mimetypes/Makefile.am
deleted file mode 100644
index c0cb8ea6..00000000
--- a/data/icons/scalable/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk