]> Dogcows Code - chaz/openbox/blobdiff - Makefile.am
changes to the client menu, which entries are there, and reorganizing, and renaming.
[chaz/openbox] / Makefile.am
index fd7c78943c333301d0887af274f98817548675fd..b879c0178e76722a8ccef8d9b10ee93d8ee604da 100644 (file)
@@ -9,9 +9,8 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-userscriptdir   = $(datadir)/openbox
 
-theme = TheBear
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -19,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
@@ -28,38 +27,41 @@ 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) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
        $(X_CFLAGS) \
-       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
+       $(PANGO_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_LIBADD = \
+       parser/libobparser.la \
        $(X_LIBS) \
-       $(XFT_LIBS) \
+       $(PANGO_LIBS) \
        $(GLIB_LIBS) \
-       $(XML_LIBS) 
+       $(XML_LIBS)
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -92,6 +94,9 @@ parser_libobparser_la_CPPFLAGS = \
        -DCONFIGDIR=\"$(configdir)\"
 parser_libobparser_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+parser_libobparser_la_LIBADD = \
+       $(GLIB_LIBS) \
+       $(XML_LIBS) 
 parser_libobparser_la_SOURCES = \
        parser/parse.h \
        parser/parse.c
@@ -99,9 +104,16 @@ parser_libobparser_la_SOURCES = \
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
+       $(SM_CFLAGS) \
+       $(XINERAMA_CFLAGS) \
+       $(XKB_CFLAGS) \
+       $(XRANDR_CFLAGS) \
+       $(XSHAPE_CFLAGS) \
+       $(XSYNC_CFLAGS) \
        $(X_CFLAGS) \
+       $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
-       $(XFT_CFLAGS) \
+       $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
@@ -111,14 +123,14 @@ openbox_openbox_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
        $(SM_LIBS) \
-       $(XFT_LIBS) \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
-       $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
+       $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
+       $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -134,6 +146,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 \
@@ -168,6 +182,8 @@ openbox_openbox_SOURCES = \
        openbox/menu.c \
        openbox/menu.h \
        openbox/misc.h \
+       openbox/modkeys.c \
+       openbox/modkeys.h \
        openbox/mouse.c \
        openbox/mouse.h \
        openbox/moveresize.c \
@@ -199,14 +215,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 ##
@@ -221,48 +242,110 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 
 ## themes ##
 
-allegro_themedir = $(themedir)/Allegro/openbox-3
-dist_allegro_theme_DATA = \
-       themes/Allegro/openbox-3/themerc \
-       themes/Allegro/openbox-3/bullet.xbm
-
-artwiz_themedir = $(themedir)/Artwiz/openbox-3
-dist_artwiz_theme_DATA = \
-       themes/Artwiz/openbox-3/themerc
-
-blah41_themedir = $(themedir)/Blah41/openbox-3
-dist_blah41_theme_DATA = \
-       themes/Blah41/openbox-3/themerc
-
-om4ob_themedir = $(themedir)/Om4Ob/openbox-3
-dist_om4ob_theme_DATA = \
-       themes/Om4Ob/openbox-3/themerc \
-       themes/Om4Ob/openbox-3/close_hover.xbm \
-       themes/Om4Ob/openbox-3/close.xbm \
-       themes/Om4Ob/openbox-3/desk_hover.xbm \
-       themes/Om4Ob/openbox-3/desk_toggled.xbm \
-       themes/Om4Ob/openbox-3/desk.xbm \
-       themes/Om4Ob/openbox-3/iconify_hover.xbm \
-       themes/Om4Ob/openbox-3/iconify_pressed.xbm \
-       themes/Om4Ob/openbox-3/iconify.xbm \
-       themes/Om4Ob/openbox-3/max_disabled.xbm \
-       themes/Om4Ob/openbox-3/max_hover.xbm \
-       themes/Om4Ob/openbox-3/max_pressed.xbm \
-       themes/Om4Ob/openbox-3/max_toggled.xbm \
-       themes/Om4Ob/openbox-3/max.xbm \
-       themes/Om4Ob/openbox-3/shade_disabled.xbm \
-       themes/Om4Ob/openbox-3/shade_hover.xbm \
-       themes/Om4Ob/openbox-3/shade_toggled.xbm \
-       themes/Om4Ob/openbox-3/shade.xbm
-
-thebear_themedir = $(themedir)/TheBear/openbox-3
-dist_thebear_theme_DATA = \
-       themes/TheBear/openbox-3/themerc
-
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+       themes/Clearlooks/openbox-3/bullet.xbm \
+       themes/Clearlooks/openbox-3/close.xbm \
+       themes/Clearlooks/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks/openbox-3/desk.xbm \
+       themes/Clearlooks/openbox-3/iconify.xbm \
+       themes/Clearlooks/openbox-3/max_toggled.xbm \
+       themes/Clearlooks/openbox-3/max.xbm \
+       themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+       themes/Clearlooks-Olive/openbox-3/bullet.xbm \
+       themes/Clearlooks-Olive/openbox-3/close.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk.xbm \
+       themes/Clearlooks-Olive/openbox-3/iconify.xbm \
+       themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/max.xbm \
+       themes/Clearlooks-Olive/openbox-3/themerc.xml
+
+mikachu_themedir = $(themedir)/Mikachu/openbox-3
+dist_mikachu_theme_DATA= \
+       themes/Mikachu/openbox-3/bullet.xbm \
+       themes/Mikachu/openbox-3/close.xbm \
+       themes/Mikachu/openbox-3/desk.xbm \
+       themes/Mikachu/openbox-3/iconify.xbm \
+       themes/Mikachu/openbox-3/max.xbm \
+       themes/Mikachu/openbox-3/themerc.xml
+
+
+natura_themedir = $(themedir)/Natura/openbox-3
+dist_natura_theme_DATA= \
+       themes/Natura/openbox-3/close_hover.xbm \
+       themes/Natura/openbox-3/close.xbm \
+       themes/Natura/openbox-3/desk_toggled.xbm \
+       themes/Natura/openbox-3/desk.xbm \
+       themes/Natura/openbox-3/iconify_disabled.xbm \
+       themes/Natura/openbox-3/iconify_hover.xbm \
+       themes/Natura/openbox-3/iconify.xbm \
+       themes/Natura/openbox-3/max_disabled.xbm \
+       themes/Natura/openbox-3/max_hover.xbm \
+       themes/Natura/openbox-3/max_toggled.xbm \
+       themes/Natura/openbox-3/max.xbm \
+       themes/Natura/openbox-3/shade.xbm \
+       themes/Natura/openbox-3/themerc.xml
+
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
+dist_artwizboxed_theme_DATA= \
+       themes/Artwiz-boxed/openbox-3/close.xbm \
+       themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
+       themes/Artwiz-boxed/openbox-3/desk.xbm \
+       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.xml
+
+bear2_themedir = $(themedir)/Bear2/openbox-3
+dist_bear2_theme_DATA= \
+       themes/Bear2/openbox-3/close_pressed.xbm \
+       themes/Bear2/openbox-3/close.xbm \
+       themes/Bear2/openbox-3/desk_toggled.xbm \
+       themes/Bear2/openbox-3/desk.xbm \
+       themes/Bear2/openbox-3/iconify_disabled.xbm \
+       themes/Bear2/openbox-3/iconify_pressed.xbm \
+       themes/Bear2/openbox-3/iconify.xbm \
+       themes/Bear2/openbox-3/max_disabled.xbm \
+       themes/Bear2/openbox-3/max_pressed.xbm \
+       themes/Bear2/openbox-3/max_toggled.xbm \
+       themes/Bear2/openbox-3/max.xbm \
+       themes/Bear2/openbox-3/shade_pressed.xbm \
+       themes/Bear2/openbox-3/shade.xbm \
+       themes/Bear2/openbox-3/themerc.xml
+
+orang_themedir = $(themedir)/Orang/openbox-3
+dist_orang_theme_DATA= \
+       themes/Orang/openbox-3/themerc.xml
+
+syscrash_themedir = $(themedir)/Syscrash/openbox-3
+dist_syscrash_theme_DATA= \
+       themes/Syscrash/openbox-3/bullet.xbm \
+       themes/Syscrash/openbox-3/close_disabled.xbm \
+       themes/Syscrash/openbox-3/close.xbm \
+       themes/Syscrash/openbox-3/desk_toggled.xbm \
+       themes/Syscrash/openbox-3/desk.xbm \
+       themes/Syscrash/openbox-3/iconify.xbm \
+       themes/Syscrash/openbox-3/max_disabled.xbm \
+       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/themerc.xml
 
 ## public headers ##
 
 pubinclude_HEADERS = \
+       render/color.h \
+       render/font.h \
+       render/geom.h \
+       render/gradient.h \
+       render/image.h \
+       render/instance.h \
+       render/mask.h \
        render/render.h \
        render/theme.h \
        parser/parse.h
@@ -303,12 +386,6 @@ 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
 
@@ -317,7 +394,24 @@ dist_noinst_DATA = \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \
-       parser/obparser-3.0.pc.in
+       parser/obparser-3.0.pc.in \
+       tools/themeupdate/themeupdate.py \
+       tests/hideshow.py \
+       tests/Makefile \
+       tests/aspect.c \
+       tests/fullscreen.c \
+       tests/grav.c \
+       tests/grouptran.c \
+       tests/icons.c \
+       tests/modal2.c \
+       tests/modal3.c \
+       tests/modal.c \
+       tests/noresize.c \
+       tests/override.c \
+       tests/positioned.c \
+       tests/strut.c \
+       tests/title.c \
+       tests/urgent.c
 
 EXTRA_DIST = \
        config.rpath \
This page took 0.029796 seconds and 4 git commands to generate.