X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=c733558832a830ff7ec4760156111180cb7851e0;hb=9dacac5e5e6b9ed86e76680b048bc227d8866ac6;hp=8fad996c1946b2bff8e68d84a41a9e33527d2920;hpb=9da838ad3ebc0bbb4a63b72e4ca9619bc86bca4e;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 8fad996c..c7335588 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,9 +36,6 @@ nodist_bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -noinst_PROGRAMS = \ - tools/themetoxml/themetoxml - ## render ## render_rendertest_CPPFLAGS = \ @@ -121,6 +118,9 @@ openbox_openbox_CPPFLAGS = \ $(XRANDR_CFLAGS) \ $(XSHAPE_CFLAGS) \ $(XSYNC_CFLAGS) \ + $(XRENDER_CFLAGS) \ + $(XDAMAGE_CFLAGS) \ + $(XCOMPOSITE_CFLAGS) \ $(X_CFLAGS) \ $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ @@ -140,6 +140,9 @@ openbox_openbox_LDADD = \ $(XSHAPE_LIBS) \ $(XSYNC_LIBS) \ $(GLIB_LIBS) \ + $(XRENDER_LIBS) \ + $(XDAMAGE_LIBS) \ + $(XCOMPOSITE_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ @@ -151,8 +154,12 @@ openbox_openbox_LDADD = \ openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ gettext.h \ - openbox/action.c \ - openbox/action.h \ + openbox/actions/all.c \ + openbox/actions/all.h \ + openbox/actions/debug.c \ + openbox/actions/execute.c \ + openbox/actions.c \ + openbox/actions.h \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ @@ -161,6 +168,8 @@ openbox_openbox_SOURCES = \ openbox/client_list_combined_menu.h \ openbox/client_menu.c \ openbox/client_menu.h \ + openbox/composite.c \ + openbox/composite.h \ openbox/config.c \ openbox/config.h \ openbox/debug.c \ @@ -173,6 +182,12 @@ openbox_openbox_SOURCES = \ openbox/extensions.h \ openbox/focus.c \ openbox/focus.h \ + openbox/focus_cycle.c \ + openbox/focus_cycle.h \ + openbox/focus_cycle_indicator.c \ + openbox/focus_cycle_indicator.h \ + openbox/focus_cycle_popup.c \ + openbox/focus_cycle_popup.h \ openbox/frame.c \ openbox/frame.h \ openbox/framerender.c \ @@ -228,21 +243,6 @@ openbox_openbox_SOURCES = \ openbox/xerror.h -## themetoxml ## - -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 ## tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ @@ -270,11 +270,11 @@ dist_docxbm_DATA = \ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 dist_clearlooks_theme_DATA= \ - themes/Clearlooks/openbox-3/themerc.xml + themes/Clearlooks/openbox-3/themerc clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 dist_clearlooksolive_theme_DATA= \ - themes/Clearlooks-Olive/openbox-3/themerc.xml + themes/Clearlooks-Olive/openbox-3/themerc mikachu_themedir = $(themedir)/Mikachu/openbox-3 dist_mikachu_theme_DATA= \ @@ -283,7 +283,7 @@ dist_mikachu_theme_DATA= \ themes/Mikachu/openbox-3/desk.xbm \ themes/Mikachu/openbox-3/iconify.xbm \ themes/Mikachu/openbox-3/max.xbm \ - themes/Mikachu/openbox-3/themerc.xml + themes/Mikachu/openbox-3/themerc natura_themedir = $(themedir)/Natura/openbox-3 @@ -300,11 +300,11 @@ dist_natura_theme_DATA= \ themes/Natura/openbox-3/max.xbm \ themes/Natura/openbox-3/shade.xbm \ themes/Natura/openbox-3/shade_hover.xbm \ - themes/Natura/openbox-3/themerc.xml + themes/Natura/openbox-3/themerc artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 dist_artwizboxed_theme_DATA= \ - themes/Artwiz-boxed/openbox-3/themerc.xml + themes/Artwiz-boxed/openbox-3/themerc bear2_themedir = $(themedir)/Bear2/openbox-3 dist_bear2_theme_DATA= \ @@ -319,11 +319,19 @@ dist_bear2_theme_DATA= \ 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 + themes/Bear2/openbox-3/themerc orang_themedir = $(themedir)/Orang/openbox-3 dist_orang_theme_DATA= \ - themes/Orang/openbox-3/themerc.xml + themes/Orang/openbox-3/themerc + +onyx_themedir = $(themedir)/Onyx/openbox-3 +dist_onyx_theme_DATA= \ + themes/Onyx/openbox-3/themerc + +onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3 +dist_onyxcitrus_theme_DATA= \ + themes/Onyx-Citrus/openbox-3/themerc syscrash_themedir = $(themedir)/Syscrash/openbox-3 dist_syscrash_theme_DATA= \ @@ -331,7 +339,7 @@ dist_syscrash_theme_DATA= \ themes/Syscrash/openbox-3/max_pressed.xbm \ themes/Syscrash/openbox-3/max_toggled.xbm \ themes/Syscrash/openbox-3/max.xbm \ - themes/Syscrash/openbox-3/themerc.xml + themes/Syscrash/openbox-3/themerc ## public headers ## @@ -369,59 +377,20 @@ edit = $(SED) \ -e 's!@configdir\@!$(configdir)!' \ -e 's!@bindir\@!$(bindir)!' -data/xsession/openbox-gnome.desktop: \ - $(srcdir)/data/xsession/openbox-gnome.desktop.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - -data/xsession/openbox-kde.desktop: \ - $(srcdir)/data/xsession/openbox-kde.desktop.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - -data/xsession/openbox.desktop: \ - $(srcdir)/data/xsession/openbox.desktop.in +%.desktop: %.desktop.in Makefile @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - -data/xsession/openbox-gnome-session: \ - $(srcdir)/data/xsession/openbox-gnome-session.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - @chmod a+x $@ - -data/xsession/openbox-kde-session: \ - $(srcdir)/data/xsession/openbox-kde-session.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - @chmod a+x $@ + @$(edit) $< >$@ -data/xsession/openbox-session: \ - $(srcdir)/data/xsession/openbox-session.in +%-session: %-session.in Makefile @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $< >$@ - @chmod a+x $@ + @$(edit) $< >$@ %.1.in: %.1.sgml @echo make: creating $@ - @mkdir doc 2>/dev/null || true @docbook-to-man $< >$@ -%.1: %.1.in +%.1: %.1.in Makefile @echo make: creating $@ - @mkdir doc 2>/dev/null || true @$(edit) $< >$@ dist_gnomewmfiles_DATA = \ @@ -436,7 +405,6 @@ dist_noinst_DATA = \ version.h.in \ data/rc.xsd \ data/menu.xsd \ - data/themerc.xsd \ data/xsession/openbox.desktop.in \ data/xsession/openbox-gnome.desktop.in \ data/xsession/openbox-kde.desktop.in \ @@ -479,10 +447,9 @@ dist_doc_DATA = \ COPYING \ data/rc.xsd \ data/menu.xsd \ - data/themerc.xsd \ doc/rc-mouse-focus.xml -dist_man_MANS = \ +nodist_man_MANS = \ doc/openbox.1 \ doc/openbox-session.1 \ doc/openbox-gnome-session.1 \ @@ -501,6 +468,20 @@ EXTRA_DIST = \ config.rpath \ mkinstalldirs +# make clean doesn't delete these for some reason, even though they are +# built by make +CLEANFILES = \ + doc/openbox.1 \ + doc/openbox-session.1 \ + doc/openbox-gnome-session.1 \ + doc/openbox-kde-session.1 \ + data/xsession/openbox-session \ + data/xsession/openbox-gnome-session \ + data/xsession/openbox-kde-session \ + data/xsession/openbox.desktop \ + data/xsession/openbox-gnome.desktop \ + data/xsession/openbox-kde.desktop + #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc