scary commit..but here goes.

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be621a0..f1b1b9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,11 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/themetoxml/themetoxml \
        tools/gnome-panel-control/gnome-panel-control
 
+noinst_PROGRAMS = \
+       tools/themetoxml/themetoxml
+
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -237,7 +239,7 @@ dist_mikachu_theme_DATA= \
        themes/Mikachu/openbox-3/desk.xbm \
        themes/Mikachu/openbox-3/iconify.xbm \
        themes/Mikachu/openbox-3/max.xbm \
-       themes/Mikachu/openbox-3/themerc
+       themes/Mikachu/openbox-3/themerc.xml
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -254,7 +256,7 @@ dist_natura_theme_DATA= \
        themes/Natura/openbox-3/max_toggled.xbm \
        themes/Natura/openbox-3/max.xbm \
        themes/Natura/openbox-3/shade.xbm \
-       themes/Natura/openbox-3/themerc
+       themes/Natura/openbox-3/themerc.xml
 
 artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
@@ -265,7 +267,7 @@ dist_artwizboxed_theme_DATA= \
        themes/artwiz-boxed/openbox-3/iconify.xbm \
        themes/artwiz-boxed/openbox-3/max_toggled.xbm \
        themes/artwiz-boxed/openbox-3/max.xbm \
-       themes/artwiz-boxed/openbox-3/themerc
+       themes/artwiz-boxed/openbox-3/themerc.xml
  
 bear2_themedir = $(themedir)/bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -282,11 +284,11 @@ dist_bear2_theme_DATA= \
        themes/bear2/openbox-3/max.xbm \
        themes/bear2/openbox-3/shade_pressed.xbm \
        themes/bear2/openbox-3/shade.xbm \
-       themes/bear2/openbox-3/themerc
+       themes/bear2/openbox-3/themerc.xml
  
 orang_themedir = $(themedir)/orang/openbox-3
 dist_orang_theme_DATA= \
-       themes/orang/openbox-3/themerc
+       themes/orang/openbox-3/themerc.xml
 
 syscrash_themedir = $(themedir)/syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -301,7 +303,7 @@ dist_syscrash_theme_DATA= \
        themes/syscrash/openbox-3/max_toggled.xbm \
        themes/syscrash/openbox-3/max.xbm \
        themes/syscrash/openbox-3/shade.xbm \
-       themes/syscrash/openbox-3/themerc
+       themes/syscrash/openbox-3/themerc.xml
 
 ## public headers ##