build-sys: move to non-recursive build

This rather large change will attempts to make 'make' to work better.
See excellent paper 'Recursive Make Considered Harmful' by Peter Miller
for further explanation why several make files is worse than one for
whole project.

Note.  The tests are build with 'make check' rather than defining TEST.

Reference: http://miller.emu.id.au/pmiller/books/rmch/
Reference: http://karelzak.blogspot.co.uk/2013/02/non-recursive-automake.html

37 files changed, 170 insertions, 134 deletions

diff --git a/data/styles/BlueFlux/Makefile.am b/data/styles/BlueFlux/Makefile.am
deleted file mode 100644
index 86965dc..0000000
--- a/data/styles/BlueFlux/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/BlueFlux
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/BlueFlux/Makemodule.am b/data/styles/BlueFlux/Makemodule.am
new file mode 100644
index 0000000..0357a9d
--- /dev/null
+++ b/data/styles/BlueFlux/Makemodule.am
@@ -0,0 +1,3 @@
+blueflux_styledir = $(pkgdatadir)/styles/BlueFlux
+
+dist_blueflux_style_DATA = data/styles/BlueFlux/theme.cfg
diff --git a/data/styles/BlueFlux/pixmaps/Makefile.am b/data/styles/BlueFlux/pixmaps/Makefile.am
deleted file mode 100644
index a247c5a..0000000
--- a/data/styles/BlueFlux/pixmaps/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
-
-style_DATA = button_close_active.xpm button_close_pressed.xpm \
-        button_close_unfocus.xpm button_max_active.xpm button_max_pressed.xpm \
-        button_max_unfocus.xpm button_min_active.xpm button_min_pressed.xpm \
-        button_min_unfocus.xpm button_stick_active.xpm button_stick_pressed.xpm \
-        button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.xpm \
-        button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
-        title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/BlueFlux/pixmaps/Makemodule.am b/data/styles/BlueFlux/pixmaps/Makemodule.am
new file mode 100644
index 0000000..9cfe8c4
--- /dev/null
+++ b/data/styles/BlueFlux/pixmaps/Makemodule.am
@@ -0,0 +1,24 @@
+blueflux_pixmaps_styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
+
+dist_blueflux_pixmaps_style_DATA = \
+        data/styles/BlueFlux/pixmaps/button_close_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_close_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_close_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_max_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_min_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_active.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_stuck.xpm \
+        data/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/button_toolbar.xpm \
+        data/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm \
+        data/styles/BlueFlux/pixmaps/menu_frame.xpm \
+        data/styles/BlueFlux/pixmaps/title_bar.xpm \
+        data/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm \
+        data/styles/BlueFlux/pixmaps/toolbar.xpm \
+        data/styles/BlueFlux/pixmaps/toolbar_label.xpm
diff --git a/data/styles/Emerge/Makefile.am b/data/styles/Emerge/Makefile.am
deleted file mode 100644
index 4054bd7..0000000
--- a/data/styles/Emerge/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/Emerge
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/Emerge/Makemodule.am b/data/styles/Emerge/Makemodule.am
new file mode 100644
index 0000000..150b600
--- /dev/null
+++ b/data/styles/Emerge/Makemodule.am
@@ -0,0 +1,3 @@
+emerge_styledir = $(pkgdatadir)/styles/Emerge
+
+dist_emerge_style_DATA = data/styles/Emerge/theme.cfg
diff --git a/data/styles/Emerge/pixmaps/Makefile.am b/data/styles/Emerge/pixmaps/Makefile.am
deleted file mode 100644
index 4165e1c..0000000
--- a/data/styles/Emerge/pixmaps/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-styledir = $(pkgdatadir)/styles/Emerge/pixmaps
-
-style_DATA = bullet.xpm close.xpm icon.xpm max.xpm stick-unfocus.xpm \
-        stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \
-        selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \
-    max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/Emerge/pixmaps/Makemodule.am b/data/styles/Emerge/pixmaps/Makemodule.am
new file mode 100644
index 0000000..42b0a4a
--- /dev/null
+++ b/data/styles/Emerge/pixmaps/Makemodule.am
@@ -0,0 +1,21 @@
+emerge_pixmaps_styledir = $(pkgdatadir)/styles/Emerge/pixmaps
+
+dist_emerge_pixmaps_style_DATA = \
+        data/styles/Emerge/pixmaps/bullet.xpm \
+        data/styles/Emerge/pixmaps/close-pressed.xpm \
+        data/styles/Emerge/pixmaps/close-unfocus.xpm \
+        data/styles/Emerge/pixmaps/close.xpm \
+        data/styles/Emerge/pixmaps/icon-pressed.xpm \
+        data/styles/Emerge/pixmaps/icon-unfocus.xpm \
+        data/styles/Emerge/pixmaps/icon.xpm \
+        data/styles/Emerge/pixmaps/max-pressed.xpm \
+        data/styles/Emerge/pixmaps/max-unfocus.xpm \
+        data/styles/Emerge/pixmaps/max.xpm \
+        data/styles/Emerge/pixmaps/selected.xpm \
+        data/styles/Emerge/pixmaps/stick-pressed.xpm \
+        data/styles/Emerge/pixmaps/stick-unfocus.xpm \
+        data/styles/Emerge/pixmaps/stick.xpm \
+        data/styles/Emerge/pixmaps/stuck-pressed.xpm \
+        data/styles/Emerge/pixmaps/stuck-unfocus.xpm \
+        data/styles/Emerge/pixmaps/stuck.xpm \
+        data/styles/Emerge/pixmaps/unselected.xpm
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
deleted file mode 100644
index 997aac5..0000000
--- a/data/styles/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS=Emerge BlueFlux bora_black bora_blue bora_green \
-        zimek_bisque zimek_darkblue zimek_green \
-        arch carp ostrich green_tea bloe
-
-styledir = $(pkgdatadir)/styles
-
-style_DATA = Makro MerleyKay Artwiz Flux \
-        Nyz Operation Outcomes Results Shade LemonSpace \
-        Twice qnx-photon BlueNight Meta
-
-include Makefile.include
diff --git a/data/styles/Makefile.include b/data/styles/Makefile.include
deleted file mode 100644
index 2a99c2b..0000000
--- a/data/styles/Makefile.include
+++ /dev/null
@@ -1,10 +0,0 @@
-## included by all Makefile.am files under the data/styles directory
-
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST=$(style_DATA)
-
-uninstall-hook:
-        rmdir $(DESTDIR)$(styledir)
-distclean-local:
-        rm -f *\~
diff --git a/data/styles/Makemodule.am b/data/styles/Makemodule.am
new file mode 100644
index 0000000..7239f1c
--- /dev/null
+++ b/data/styles/Makemodule.am
@@ -0,0 +1,19 @@
+styledir = $(pkgdatadir)/styles
+
+style_DATA = \
+        data/styles/Artwiz \
+        data/styles/BlueNight \
+        data/styles/Flux \
+        data/styles/LemonSpace \
+        data/styles/Makro \
+        data/styles/MerleyKay \
+        data/styles/Meta \
+        data/styles/Nyz \
+        data/styles/Operation \
+        data/styles/Outcomes \
+        data/styles/Results \
+        data/styles/Shade \
+        data/styles/Twice \
+        data/styles/qnx-photon
+
+EXTRA_DIST += $(style_DATA)
diff --git a/data/styles/arch/Makefile.am b/data/styles/arch/Makefile.am
deleted file mode 100644
index bc1aafa..0000000
--- a/data/styles/arch/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/arch
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/arch/Makemodule.am b/data/styles/arch/Makemodule.am
new file mode 100644
index 0000000..4ad28b9
--- /dev/null
+++ b/data/styles/arch/Makemodule.am
@@ -0,0 +1,3 @@
+arch_styledir = $(pkgdatadir)/styles/arch
+
+dist_arch_style_DATA = data/styles/arch/theme.cfg
diff --git a/data/styles/arch/pixmaps/Makefile.am b/data/styles/arch/pixmaps/Makefile.am
deleted file mode 100644
index fb94c36..0000000
--- a/data/styles/arch/pixmaps/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-styledir = $(pkgdatadir)/styles/arch/pixmaps
-
-style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
-         minufcs.xpm shadepr.xpm stickpr.xpm stuckufcs.xpm unselected.xpm \
-         unshadeufcs.xpm bullet.xpm closeufcs.xpm maxfcs.xpm \
-         menuiconfcs.xpm minfcs.xpm selected.xpm shadeufcs.xpm \
-         stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.xpm \
-        frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
-         stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
-
-
-include ../../Makefile.include
diff --git a/data/styles/arch/pixmaps/Makemodule.am b/data/styles/arch/pixmaps/Makemodule.am
new file mode 100644
index 0000000..fa47014
--- /dev/null
+++ b/data/styles/arch/pixmaps/Makemodule.am
@@ -0,0 +1,33 @@
+arch_pixmaps_styledir = $(pkgdatadir)/styles/arch/pixmaps
+
+dist_arch_pixmaps_style_DATA = \
+        data/styles/arch/pixmaps/bullet.xpm \
+        data/styles/arch/pixmaps/closefcs.xpm \
+        data/styles/arch/pixmaps/closepr.xpm \
+        data/styles/arch/pixmaps/closeufcs.xpm \
+        data/styles/arch/pixmaps/frame.xpm \
+        data/styles/arch/pixmaps/gripfcs.xpm \
+        data/styles/arch/pixmaps/maxfcs.xpm \
+        data/styles/arch/pixmaps/maxpr.xpm \
+        data/styles/arch/pixmaps/maxufcs.xpm \
+        data/styles/arch/pixmaps/menuiconfcs.xpm \
+        data/styles/arch/pixmaps/menuiconpr.xpm \
+        data/styles/arch/pixmaps/menuiconufcs.xpm \
+        data/styles/arch/pixmaps/minfcs.xpm \
+        data/styles/arch/pixmaps/minpr.xpm \
+        data/styles/arch/pixmaps/minufcs.xpm \
+        data/styles/arch/pixmaps/selected.xpm \
+        data/styles/arch/pixmaps/shadefcs.xpm \
+        data/styles/arch/pixmaps/shadepr.xpm \
+        data/styles/arch/pixmaps/shadeufcs.xpm \
+        data/styles/arch/pixmaps/stickfcs.xpm \
+        data/styles/arch/pixmaps/stickpr.xpm \
+        data/styles/arch/pixmaps/stickufcs.xpm \
+        data/styles/arch/pixmaps/stuckfcs.xpm \
+        data/styles/arch/pixmaps/stuckufcs.xpm \
+        data/styles/arch/pixmaps/tbarfcs.xpm \
+        data/styles/arch/pixmaps/tbarufcs.xpm \
+        data/styles/arch/pixmaps/unselected.xpm \
+        data/styles/arch/pixmaps/unshadefcs.xpm \
+        data/styles/arch/pixmaps/unshadepr.xpm \
+        data/styles/arch/pixmaps/unshadeufcs.xpm
diff --git a/data/styles/bloe/Makefile.am b/data/styles/bloe/Makefile.am
deleted file mode 100644
index ad574ba..0000000
--- a/data/styles/bloe/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/bloe
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bloe/Makemodule.am b/data/styles/bloe/Makemodule.am
new file mode 100644
index 0000000..909f647
--- /dev/null
+++ b/data/styles/bloe/Makemodule.am
@@ -0,0 +1,3 @@
+bloe_styledir = $(pkgdatadir)/styles/bloe
+
+dist_bloe_style_DATA = data/styles/bloe/theme.cfg
diff --git a/data/styles/bloe/pixmaps/Makefile.am b/data/styles/bloe/pixmaps/Makefile.am
deleted file mode 100644
index 42226a0..0000000
--- a/data/styles/bloe/pixmaps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-styledir = $(pkgdatadir)/styles/bloe/pixmaps
-
-style_DATA = bullet.xpm closepr.xpm frame.xpm maxfcs.xpm \
-        maxufcs.xpm menuiconpr.xpm minfcs.xpm minufcs.xpm \
-        shadefcs.xpm shadeufcs.xpm stickpr.xpm stuckfcs.xpm \
-        tbarfcs.xpm unselected.xpm unshadepr.xpm \
-        windowlabelfcs.xpm closefcs.xpm closeufcs.xpm \
-        maxpr.xpm menuiconfcs.xpm menuiconufcs.xpm \
-        minpr.xpm selected.xpm shadepr.xpm stickfcs.xpm \
-        stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
-        unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/bloe/pixmaps/Makemodule.am b/data/styles/bloe/pixmaps/Makemodule.am
new file mode 100644
index 0000000..2d08d3b
--- /dev/null
+++ b/data/styles/bloe/pixmaps/Makemodule.am
@@ -0,0 +1,34 @@
+pixmaps_styledir = $(pkgdatadir)/styles/bloe/pixmaps
+
+dist_pixmaps_style_DATA = \
+        data/styles/bloe/pixmaps/bullet.xpm \
+        data/styles/bloe/pixmaps/closefcs.xpm \
+        data/styles/bloe/pixmaps/closepr.xpm \
+        data/styles/bloe/pixmaps/closeufcs.xpm \
+        data/styles/bloe/pixmaps/frame.xpm \
+        data/styles/bloe/pixmaps/maxfcs.xpm \
+        data/styles/bloe/pixmaps/maxpr.xpm \
+        data/styles/bloe/pixmaps/maxufcs.xpm \
+        data/styles/bloe/pixmaps/menuiconfcs.xpm \
+        data/styles/bloe/pixmaps/menuiconpr.xpm \
+        data/styles/bloe/pixmaps/menuiconufcs.xpm \
+        data/styles/bloe/pixmaps/minfcs.xpm \
+        data/styles/bloe/pixmaps/minpr.xpm \
+        data/styles/bloe/pixmaps/minufcs.xpm \
+        data/styles/bloe/pixmaps/selected.xpm \
+        data/styles/bloe/pixmaps/shadefcs.xpm \
+        data/styles/bloe/pixmaps/shadepr.xpm \
+        data/styles/bloe/pixmaps/shadeufcs.xpm \
+        data/styles/bloe/pixmaps/stickfcs.xpm \
+        data/styles/bloe/pixmaps/stickpr.xpm \
+        data/styles/bloe/pixmaps/stickufcs.xpm \
+        data/styles/bloe/pixmaps/stuckfcs.xpm \
+        data/styles/bloe/pixmaps/stuckufcs.xpm \
+        data/styles/bloe/pixmaps/tbarfcs.xpm \
+        data/styles/bloe/pixmaps/tbarufcs.xpm \
+        data/styles/bloe/pixmaps/unselected.xpm \
+        data/styles/bloe/pixmaps/unshadefcs.xpm \
+        data/styles/bloe/pixmaps/unshadepr.xpm \
+        data/styles/bloe/pixmaps/unshadeufcs.xpm \
+        data/styles/bloe/pixmaps/windowlabelfcs.xpm \
+        data/styles/bloe/pixmaps/windowlabelufcs.xpm
diff --git a/data/styles/bora_black/Makefile.am b/data/styles/bora_black/Makefile.am
deleted file mode 100644
index 4cb9ffb..0000000
--- a/data/styles/bora_black/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_black
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_black/Makemodule.am b/data/styles/bora_black/Makemodule.am
new file mode 100644
index 0000000..27f7221
--- /dev/null
+++ b/data/styles/bora_black/Makemodule.am
@@ -0,0 +1,3 @@
+bora_black_styledir = $(pkgdatadir)/styles/bora_black
+
+dist_bora_black_style_DATA = data/styles/bora_black/theme.cfg
diff --git a/data/styles/bora_blue/Makefile.am b/data/styles/bora_blue/Makefile.am
deleted file mode 100644
index c726064..0000000
--- a/data/styles/bora_blue/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_blue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_blue/Makemodule.am b/data/styles/bora_blue/Makemodule.am
new file mode 100644
index 0000000..547b2e3
--- /dev/null
+++ b/data/styles/bora_blue/Makemodule.am
@@ -0,0 +1,3 @@
+bora_blue_styledir = $(pkgdatadir)/styles/bora_blue
+
+dist_bora_blue_style_DATA = data/styles/bora_blue/theme.cfg
diff --git a/data/styles/bora_green/Makefile.am b/data/styles/bora_green/Makefile.am
deleted file mode 100644
index 37d47e1..0000000
--- a/data/styles/bora_green/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_green/Makemodule.am b/data/styles/bora_green/Makemodule.am
new file mode 100644
index 0000000..ae52e15
--- /dev/null
+++ b/data/styles/bora_green/Makemodule.am
@@ -0,0 +1,3 @@
+bora_green_styledir = $(pkgdatadir)/styles/bora_green
+
+dist_bora_green_style_DATA = data/styles/bora_green/theme.cfg
diff --git a/data/styles/carp/Makefile.am b/data/styles/carp/Makefile.am
deleted file mode 100644
index 3e31178..0000000
--- a/data/styles/carp/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/carp
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/carp/Makemodule.am b/data/styles/carp/Makemodule.am
new file mode 100644
index 0000000..241901e
--- /dev/null
+++ b/data/styles/carp/Makemodule.am
@@ -0,0 +1,3 @@
+carp_styledir = $(pkgdatadir)/styles/carp
+
+dist_carp_style_DATA = data/styles/carp/theme.cfg
diff --git a/data/styles/green_tea/Makefile.am b/data/styles/green_tea/Makefile.am
deleted file mode 100644
index 899e028..0000000
--- a/data/styles/green_tea/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/green_tea
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/green_tea/Makemodule.am b/data/styles/green_tea/Makemodule.am
new file mode 100644
index 0000000..4ff80f2
--- /dev/null
+++ b/data/styles/green_tea/Makemodule.am
@@ -0,0 +1,3 @@
+green_tea_styledir = $(pkgdatadir)/styles/green_tea
+
+dist_green_tea_style_DATA = data/styles/green_tea/theme.cfg
diff --git a/data/styles/ostrich/Makefile.am b/data/styles/ostrich/Makefile.am
deleted file mode 100644
index c9879c8..0000000
--- a/data/styles/ostrich/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/ostrich
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/ostrich/Makemodule.am b/data/styles/ostrich/Makemodule.am
new file mode 100644
index 0000000..61536e2
--- /dev/null
+++ b/data/styles/ostrich/Makemodule.am
@@ -0,0 +1,3 @@
+ostrich_styledir = $(pkgdatadir)/styles/ostrich
+
+dist_ostrich_style_DATA = data/styles/ostrich/theme.cfg
diff --git a/data/styles/zimek_bisque/Makefile.am b/data/styles/zimek_bisque/Makefile.am
deleted file mode 100644
index 9869bdf..0000000
--- a/data/styles/zimek_bisque/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_bisque
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_bisque/Makemodule.am b/data/styles/zimek_bisque/Makemodule.am
new file mode 100644
index 0000000..3c20430
--- /dev/null
+++ b/data/styles/zimek_bisque/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_bisque_styledir = $(pkgdatadir)/styles/zimek_bisque
+
+dist_zimek_bisque_style_DATA = data/styles/zimek_bisque/theme.cfg
diff --git a/data/styles/zimek_darkblue/Makefile.am b/data/styles/zimek_darkblue/Makefile.am
deleted file mode 100644
index a84b7f4..0000000
--- a/data/styles/zimek_darkblue/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_darkblue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_darkblue/Makemodule.am b/data/styles/zimek_darkblue/Makemodule.am
new file mode 100644
index 0000000..88f06f1
--- /dev/null
+++ b/data/styles/zimek_darkblue/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_darkblue_styledir = $(pkgdatadir)/styles/zimek_darkblue
+
+dist_zimek_darkblue_style_DATA = data/styles/zimek_darkblue/theme.cfg
diff --git a/data/styles/zimek_green/Makefile.am b/data/styles/zimek_green/Makefile.am
deleted file mode 100644
index 43dbb82..0000000
--- a/data/styles/zimek_green/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_green/Makemodule.am b/data/styles/zimek_green/Makemodule.am
new file mode 100644
index 0000000..e42be6e
--- /dev/null
+++ b/data/styles/zimek_green/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_green_styledir = $(pkgdatadir)/styles/zimek_green
+
+dist_zimek_green_style_DATA = data/styles/zimek_green/theme.cfg