4 files changed, 37 insertions, 19 deletions

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