X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=2b578b9b9d71df79a663a61031eb5c9ea89a96ba;hb=e2f3c002248193d800941500c66e7b4c69b26a10;hp=206f4d6ae74c15e5533f6ff73bb614ee0cef6059;hpb=5c57e043e1564be0f7f4900214a3a748e84379d7;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 206f4d6a..2b578b9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,20 @@ 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 foreign -AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. @@ -17,17 +23,13 @@ noinst_PROGRAMS = \ render/rendertest lib_LTLIBRARIES = \ - render/libobrender.la \ - parser/libobparser.la + parser/libobparser.la \ + render/libobrender.la 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 ## @@ -35,20 +37,25 @@ 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) \ + $(XML_LIBS) render_rendertest_SOURCES = render/test.c 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) + $(X_LIBS) +render_libobrender_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) render_libobrender_la_SOURCES = \ gettext.h \ render/color.h \ @@ -58,6 +65,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 +84,10 @@ parser_libobparser_la_CPPFLAGS = \ $(XML_CFLAGS) \ -DG_LOG_DOMAIN=\"ObParser\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" -parser_libobparser_la_LIBADD = \ - $(GLIB_LIBS) \ - $(XML_LIBS) + -DDATADIR=\"$(datadir)\" \ + -DCONFIGDIR=\"$(configdir)\" +parser_libobparser_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) parser_libobparser_la_SOURCES = \ parser/parse.h \ parser/parse.c @@ -94,10 +102,12 @@ openbox_openbox_CPPFLAGS = \ $(LIBSN_CFLAGS) \ $(XML_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DCONFIGDIR=\"$(configdir)\" \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ + $(XFT_LIBS) \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ @@ -183,26 +193,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,66 +204,124 @@ 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 + +edit = $(SED) \ + -e 's!@version\@!$(VERSION)!' \ + -e 's!@xsddir\@!$(xsddir)!' + +data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data + @echo make: creating $@ + @rm -f $@ + @mkdir data 2>/dev/null || true + @$(edit) $(srcdir)/data/rc.xml.in >$@ + +data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data + @echo make: creating $@ + @rm -f $@ + @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 + data/rc.xml.in \ + data/menu.xml.in \ + render/obrender-3.0.pc.in \ + parser/obparser-3.0.pc.in EXTRA_DIST = \ config.rpath \ mkinstalldirs \ + CHANGELOG \ README \ COPYING \ AUTHORS +CLEANFILES = \ + data/rc.xml \ + data/menu.xml + #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc