Merge branch 'fifteen'
[livewp] / applet / data / Makefile.am
index 24a8b68..48cab8b 100644 (file)
@@ -40,6 +40,12 @@ videotheme_DATA = theme/Video/*
 xsnowthemedir = $(datadir)/livewp/theme/Xsnow
 xsnowtheme_DATA = theme/Xsnow/* 
 
+colorfloodthemedir = $(datadir)/livewp/theme/Colorflood
+colorfloodtheme_DATA = theme/Colorflood/* 
+
+conkythemedir = $(datadir)/livewp/theme/Conky
+conkytheme_DATA = theme/Conky/* 
+
 externalthemedir = $(datadir)/livewp/external_themes
 externaltheme_DATA = external_themes/* 
 
@@ -78,6 +84,8 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(fifteentheme_DATA) \
             $(videotheme_DATA) \
             $(xshowtheme_DATA) \
+            $(conkytheme_DATA) \
+            $(colorfloodtheme_DATA) \
             $(externaltheme_DATA) \
             $(dbus_service_DATA)