]> Dogcows Code - chaz/openbox/blobdiff - Makefile.am
projects / chaz / openbox / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add gnomepanelproxy
[chaz/openbox] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 036575297457cf5aedc71c3728dfb11d2bb2f895..8612a20768ed3db6c4154ec97470a8d90203dd8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,16 @@
 SUBDIRS = m4 po
 
-themedir        = $(datadir)/openbox/themes
+themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
-rcdir           = $(datadir)/openbox
+configdir       = $(sysconfdir)/xdg
+rcdir           = $(configdir)/openbox
 desktopfilesdir = $(datadir)/gnome/wm-properties
+pkgconfigdir    = $(libdir)/pkgconfig
+pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+userscriptdir   = $(datadir)/openbox
 
-theme = thebear
+theme = TheBear
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
@@ -22,12 +26,8 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/kdetrayproxy/kdetrayproxy
-
-if OBCONF
-bin_PROGRAMS += \
-       tools/obconf/obconf
-endif
+       tools/kdetrayproxy/kdetrayproxy \
+       tools/gnomepanelproxy/gnomepanelproxy
 
 ## render ##
 
@@ -42,13 +42,16 @@ render_libobrender_la_CPPFLAGS = \
        $(X_CFLAGS) \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
+       $(XML_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
-       -DDEFAULT_THEME=\"$(theme)\" \
-       -DTHEMEDIR=\"$(themedir)\"
+       -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LIBADD = \
        $(X_LIBS) \
        $(XFT_LIBS) \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) \
+       parser/libobparser.la
+render_libobrender_la_LDFLAGS = \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -58,6 +61,7 @@ render_libobrender_la_SOURCES = \
        render/geom.h \
        render/gradient.h \
        render/gradient.c \
+       render/icon.h \
        render/image.h \
        render/image.c \
        render/instance.h \
@@ -76,10 +80,13 @@ parser_libobparser_la_CPPFLAGS = \
        $(XML_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObParser\" \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DRCDIR=\"$(rcdir)\"
+       -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_SOURCES = \
        parser/parse.h \
        parser/parse.c
@@ -91,11 +98,11 @@ openbox_openbox_CPPFLAGS = \
        $(SM_CFLAGS) \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GMODULE_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DRCDIR=\"$(rcdir)\" \
+       -DDATADIR=\"$(datadir)\" \
+       -DCONFIGDIR=\"$(configdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
        $(SM_LIBS) \
@@ -105,7 +112,6 @@ openbox_openbox_LDADD = \
        $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
-       $(GMODULE_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -148,6 +154,8 @@ openbox_openbox_SOURCES = \
        openbox/keyboard.h \
        openbox/keytree.c \
        openbox/keytree.h \
+       openbox/mainloop.c \
+       openbox/mainloop.h \
        openbox/menuframe.c \
        openbox/menuframe.h \
        openbox/menu.c \
@@ -174,10 +182,8 @@ openbox_openbox_SOURCES = \
        openbox/session.h \
        openbox/stacking.c \
        openbox/stacking.h \
-       openbox/startup.c \
-       openbox/startup.h \
-       openbox/timer.c \
-       openbox/timer.h \
+       openbox/startupnotify.c \
+       openbox/startupnotify.h \
        openbox/translate.c \
        openbox/translate.h \
        openbox/window.c \
@@ -185,28 +191,6 @@ openbox_openbox_SOURCES = \
        openbox/xerror.c \
        openbox/xerror.h
 
-## obconf ##
-
-tools_obconf_obconf_CPPFLAGS = \
-       $(GTK_CFLAGS) \
-       $(GDK_PIXBUF_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DRCDIR=\"$(rcdir)\" \
-       -DPIXMAPDIR=\"$(pixmapdir)\" \
-       -DG_LOG_DOMAIN=\"Obconf\"
-tools_obconf_obconf_LDADD = \
-       $(GTK_LIBS) \
-       $(GDK_PIXBUF_LIBS) \
-       $(LIBINTL) \
-       render/libobrender.la \
-       parser/libobparser.la
-tools_obconf_obconf_SOURCES = \
-       gettext.h \
-       tools/obconf/main.c \
-       plugins/obconf_interface.h
-
 
 ## kdetrayproxy ##
 
@@ -218,92 +202,90 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \
        tools/kdetrayproxy/kdetrayproxy.c
 
 
+## gnomepanelproxy ##
+
+tools_gnomepanelproxy_gnomepanelproxy_CPPFLAGS = \
+       $(X_CFLAGS)
+tools_gnomepanelproxy_gnomepanelproxy_LDADD = \
+       $(X_LIBS)
+tools_gnomepanelproxy_gnomepanelproxy_SOURCES = \
+       tools/gnomepanelproxy/gnomepanelproxy.c
+
+
 ## themes ##
 
-thebear_themedir = $(themedir)/thebear
-dist_thebear_theme_DATA = \
-       themes/thebear/themerc
-
-planton_themedir = $(themedir)/planton
-dist_planton_theme_DATA = \
-       themes/planton/themerc \
-       themes/planton/max.xbm \
-       themes/planton/max_toggled.xbm \
-       themes/planton/desk.xbm \
-       themes/planton/desk_toggled.xbm \
-       themes/planton/shade.xbm \
-       themes/planton/shade_toggled.xbm \
-       themes/planton/iconify.xbm \
-       themes/planton/close.xbm
-
-lightindustry_themedir = $(themedir)/Light-Industry
-dist_lightindustry_theme_DATA = \
-       themes/Light-Industry/themerc \
-       themes/Light-Industry/max.xbm \
-       themes/Light-Industry/iconify.xbm \
-       themes/Light-Industry/close.xbm
-
-lightindustrybig_themedir = $(themedir)/Light-Industry-big
-dist_lightindustrybig_theme_DATA = \
-       themes/Light-Industry-big/themerc \
-       themes/Light-Industry-big/max.xbm \
-       themes/Light-Industry-big/iconify.xbm \
-       themes/Light-Industry-big/close.xbm
-
-imerry_themedir = $(themedir)/I-merry
-dist_imerry_theme_DATA = \
-       themes/I-merry/themerc \
-       themes/I-merry/max.xbm \
-       themes/I-merry/iconify.xbm \
-       themes/I-merry/close.xbm
-
-greenz_themedir = $(themedir)/greenz
-dist_greenz_theme_DATA = \
-       themes/greenz/themerc
-
-bbstyle_themedir = $(themedir)/BBstylE
-dist_bbstyle_theme_DATA = \
-       themes/BBstylE/themerc \
-       themes/BBstylE/max.xbm \
-       themes/BBstylE/max_toggled.xbm \
-       themes/BBstylE/desk.xbm \
-       themes/BBstylE/desk_toggled.xbm \
-       themes/BBstylE/shade.xbm \
-       themes/BBstylE/shade_toggled.xbm \
-       themes/BBstylE/iconify.xbm \
-       themes/BBstylE/close.xbm
-
-om4ob_themedir = $(themedir)/om4ob
+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/themerc \
-       themes/om4ob/close_hover.xbm \
-       themes/om4ob/close.xbm \
-       themes/om4ob/desk_hover.xbm \
-       themes/om4ob/desk_toggled.xbm \
-       themes/om4ob/desk.xbm \
-       themes/om4ob/iconify_hover.xbm \
-       themes/om4ob/iconify_pressed.xbm \
-       themes/om4ob/iconify.xbm \
-       themes/om4ob/max_disabled.xbm \
-       themes/om4ob/max_hover.xbm \
-       themes/om4ob/max_pressed.xbm \
-       themes/om4ob/max_toggled.xbm \
-       themes/om4ob/max.xbm \
-       themes/om4ob/shade_disabled.xbm \
-       themes/om4ob/shade_hover.xbm \
-       themes/om4ob/shade_toggled.xbm \
-       themes/om4ob/shade.xbm
+       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
 
 
+## public headers ##
+
+pubinclude_HEADERS = \
+       render/render.h \
+       render/theme.h \
+       parser/parse.h
+
+nodist_pkgconfig_DATA = \
+       render/obrender-3.0.pc \
+       parser/obparser-3.0.pc
+
 ## data ##
 
+dist_pixmap_DATA = \
+       data/openbox.png
+
 dist_rc_DATA = \
-       data/rc3 \
-       data/menu
+       data/rc.xml \
+       data/menu.xml
+
+dist_userscript_DATA = \
+       tools/themeupdate/themeupdate.py
+
+install-data-hook:
+       chmod +x $(userscriptdir)/themeupdate.py
 
 dist_desktopfiles_DATA = \
        data/openbox.desktop
 
+dist_noinst_DATA = \
+       render/obrender-3.0.pc.in \
+       parser/obparser-3.0.pc.in
+
 EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
my patches for the openbox window manager
This page took 0.026484 seconds and 4 git commands to generate.