X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=0d688f1ab8c3ff5b1f857d4fe98c03d62c36ec47;hb=d5f9df0845eb28dee542a789e43ca4cc1b6d0a4f;hp=fbfb3789d054951b3a1e237a0d0e6e4c6344ba5a;hpb=2573b51904e04f366ba4f6b858caa2471cdcb53f;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index fbfb3789..0d688f1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,17 @@ 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 +xsddir = $(datadir)/openbox +userscriptdir = $(datadir)/openbox -theme = thebear +theme = TheBear AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 @@ -22,12 +27,8 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ - tools/kdetrayproxy/kdetrayproxy - -if OBCONF -bin_PROGRAMS += \ - tools/obconf/obconf -endif + tools/kdetrayproxy/kdetrayproxy \ + tools/gnome-panel-control/gnome-panel-control ## render ## @@ -42,13 +43,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 +62,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 +81,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 @@ -94,7 +102,8 @@ openbox_openbox_CPPFLAGS = \ $(LIBSN_CFLAGS) \ $(XML_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DCONFIGDIR=\"$(configdir)\" \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ @@ -174,8 +183,8 @@ openbox_openbox_SOURCES = \ openbox/session.h \ openbox/stacking.c \ openbox/stacking.h \ - openbox/startup.c \ - openbox/startup.h \ + openbox/startupnotify.c \ + openbox/startupnotify.h \ openbox/translate.c \ openbox/translate.h \ openbox/window.c \ @@ -183,26 +192,6 @@ openbox_openbox_SOURCES = \ openbox/xerror.c \ openbox/xerror.h -## obconf ## - -tools_obconf_obconf_CPPFLAGS = \ - $(GTK_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) \ - $(XML_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" \ - -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 - ## kdetrayproxy ## @@ -214,58 +203,99 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \ tools/kdetrayproxy/kdetrayproxy.c +## gnome-panel-control ## + +tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ + $(X_CFLAGS) +tools_gnome_panel_control_gnome_panel_control_LDADD = \ + $(X_LIBS) +tools_gnome_panel_control_gnome_panel_control_SOURCES = \ + tools/gnome-panel-control/gnome-panel-control.c + + ## themes ## -allegro_themedir = $(themedir)/allegro +allegro_themedir = $(themedir)/Allegro/openbox-3 dist_allegro_theme_DATA = \ - themes/allegro/themerc \ - themes/allegro/bullet.xbm + themes/Allegro/openbox-3/themerc \ + themes/Allegro/openbox-3/bullet.xbm -artwiz_themedir = $(themedir)/artwiz +artwiz_themedir = $(themedir)/Artwiz/openbox-3 dist_artwiz_theme_DATA = \ - themes/artwiz/themerc + themes/Artwiz/openbox-3/themerc -blah41_themedir = $(themedir)/blah41 +blah41_themedir = $(themedir)/Blah41/openbox-3 dist_blah41_theme_DATA = \ - themes/blah41/themerc + themes/Blah41/openbox-3/themerc -om4ob_themedir = $(themedir)/om4ob +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 - -thebear_themedir = $(themedir)/thebear + 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/themerc + 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_rc_DATA = \ +dist_pixmap_DATA = \ + data/openbox.png + +nodist_rc_DATA = \ data/rc.xml \ data/menu.xml +dist_xsd_DATA = \ + data/rc.xsd \ + data/menu.xsd + +%.xml: %.xml.in + @echo make: creating $@ + @$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@ + +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 + data/rc.xml.in \ + data/menu.xml.in \ + render/obrender-3.0.pc.in \ + parser/obparser-3.0.pc.in EXTRA_DIST = \ config.rpath \