give labeled separators borders

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f7fa16a8fc5f5d57d898b06db913162869117ad5..5d4637284fa69044fcacfcd863bafc00af4e06bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-userscriptdir   = $(datadir)/openbox
 
 theme = bear2
 
@@ -28,19 +27,20 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/kdetrayproxy/kdetrayproxy \
        tools/gnome-panel-control/gnome-panel-control
 
+noinst_PROGRAMS = \
+       tools/themetoxml/themetoxml
+
 ## render ##
 
 render_rendertest_CPPFLAGS = \
-       $(XFT_CFLAGS) \
+       $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
        parser/libobparser.la \
        render/libobrender.la \
-       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
        $(XML_LIBS) \
@@ -49,7 +49,6 @@ render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
        $(X_CFLAGS) \
-       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
@@ -60,7 +59,6 @@ render_libobrender_la_LDFLAGS = \
 render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
-       $(XFT_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
@@ -107,8 +105,9 @@ parser_libobparser_la_SOURCES = \
 
 openbox_openbox_CPPFLAGS = \
        $(X_CFLAGS) \
+       $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
-       $(XFT_CFLAGS) \
+       $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
@@ -124,6 +123,7 @@ openbox_openbox_LDADD = \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
+       $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -139,6 +139,8 @@ openbox_openbox_SOURCES = \
        openbox/client.h \
        openbox/client_list_menu.c \
        openbox/client_list_menu.h \
+       openbox/client_list_combined_menu.c \
+       openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
        openbox/client_menu.h \
        openbox/config.c \
@@ -204,14 +206,19 @@ openbox_openbox_SOURCES = \
        openbox/xerror.h
 
 
-## kdetrayproxy ##
+## themetoxml ##
 
-tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
-       $(X_CFLAGS)
-tools_kdetrayproxy_kdetrayproxy_LDADD = \
-       $(X_LIBS)
-tools_kdetrayproxy_kdetrayproxy_SOURCES = \
-       tools/kdetrayproxy/kdetrayproxy.c
+tools_themetoxml_themetoxml_CPPFLAGS = \
+       $(X_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(XML_CFLAGS)
+tools_themetoxml_themetoxml_LDADD = \
+       $(X_LIBS) \
+       $(GLIB_LIBS) \
+       $(XML_LIBS)
+tools_themetoxml_themetoxml_SOURCES = \
+       tools/themetoxml/themetoxml.c \
+       tools/themetoxml/rgb.h
 
 
 ## gnome-panel-control ##
@@ -233,7 +240,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
@@ -250,7 +257,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= \
@@ -261,7 +268,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= \
@@ -278,11 +285,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= \
@@ -296,7 +303,8 @@ dist_syscrash_theme_DATA= \
        themes/syscrash/openbox-3/max_pressed.xbm \
        themes/syscrash/openbox-3/max_toggled.xbm \
        themes/syscrash/openbox-3/max.xbm \
-       themes/syscrash/openbox-3/shade.xbm
+       themes/syscrash/openbox-3/shade.xbm \
+       themes/syscrash/openbox-3/themerc.xml
 
 ## public headers ##
 
@@ -348,16 +356,11 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
        @mkdir data 2>/dev/null || true
        @$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_userscript_DATA = \
-       tools/themeupdate/themeupdate.py
-
-install-data-hook:
-       chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
-
 dist_desktopfiles_DATA = \
        data/openbox.desktop
 
 dist_noinst_DATA = \
+       tools/themeupdate/themeupdate.py \
        version.h.in \
        data/rc.xml.in \
        data/menu.xml.in \