]> Dogcows Code - chaz/openbox/blobdiff - Makefile.am
projects / chaz / openbox / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
a combined client_list_menu, use as client-list-combined-menu in your rc.xml. needs...
[chaz/openbox] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 86a7e85d36068146af1247f9d9f69cab7004c13c..2c2ba0207a7f7c32c46b7ba2e3c69854510a3b4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,19 +11,20 @@ pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 userscriptdir   = $(datadir)/openbox
 
-theme = TheBear
+theme = bear2
+
+AUTOMAKE_OPTIONS = subdir-objects foreign
 
-AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       parser/libobparser.la
+       parser/libobparser.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
@@ -36,7 +37,14 @@ render_rendertest_CPPFLAGS = \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+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 = \
@@ -44,15 +52,18 @@ render_libobrender_la_CPPFLAGS = \
        $(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) \
-       parser/libobparser.la
-render_libobrender_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       $(XML_LIBS)
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -83,11 +94,11 @@ parser_libobparser_la_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(XML_LIBS)
 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
@@ -110,9 +121,9 @@ openbox_openbox_LDADD = \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
-       $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
+       $(X_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -127,7 +138,8 @@ openbox_openbox_SOURCES = \
        openbox/client.c \
        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 \
@@ -215,52 +227,96 @@ 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
-
+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
+
+
+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
+
+artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
+dist_artwizboxed_theme_DATA= \
+       themes/artwiz-boxed/openbox-3/bullet.xbm \
+       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
+ 
+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
+ 
+orang_themedir = $(themedir)/orang/openbox-3
+dist_orang_theme_DATA= \
+       themes/orang/openbox-3/themerc
+
+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
 
 ## 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
 
+nodist_pubinclude_HEADERS = \
+       version.h
+
 nodist_pkgconfig_DATA = \
        render/obrender-3.0.pc \
        parser/obparser-3.0.pc
@@ -304,6 +360,7 @@ dist_desktopfiles_DATA = \
        data/openbox.desktop
 
 dist_noinst_DATA = \
+       version.h.in \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \
@@ -312,6 +369,8 @@ dist_noinst_DATA = \
 EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
+       CHANGELOG \
+       COMPLIANCE \
        README \
        COPYING \
        AUTHORS
my patches for the openbox window manager
This page took 0.024893 seconds and 4 git commands to generate.