4 files changed, 24 insertions, 14 deletions

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