X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=baa62b3339aa029f7f67444b692edf81333f7bb4;hb=96bb892054bb9801fd2b5b7959ee2cec27c075ea;hp=0add3f626e12152d8592e29d8967267eb03d6df1;hpb=ef83d821cad3d0d90b8bb38a367cec39c6736abd;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 0add3f62..baa62b33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,13 +31,11 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control -bin_SCRIPTS = \ +nodist_bin_SCRIPTS = \ + data/xsession/openbox-session \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -noinst_PROGRAMS = \ - tools/themetoxml/themetoxml - ## render ## render_rendertest_CPPFLAGS = \ @@ -172,6 +170,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 \ @@ -227,21 +231,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 = \ @@ -269,11 +258,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= \ @@ -282,7 +271,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 @@ -299,11 +288,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= \ @@ -318,11 +307,11 @@ 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 syscrash_themedir = $(themedir)/Syscrash/openbox-3 dist_syscrash_theme_DATA= \ @@ -330,7 +319,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 ## @@ -359,6 +348,7 @@ dist_pixmap_DATA = \ data/openbox.png dist_rc_DATA = \ + data/autostart.sh \ data/rc.xml \ data/menu.xml @@ -367,66 +357,48 @@ edit = $(SED) \ -e 's!@configdir\@!$(configdir)!' \ -e 's!@bindir\@!$(bindir)!' -data/xsession/openbox-gnome-session: Makefile \ - $(srcdir)/data/xsession/openbox-gnome-session.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ - @chmod a+x $@ - -data/xsession/openbox-kde-session: Makefile \ - $(srcdir)/data/xsession/openbox-kde-session.in - @echo make: creating $@ - @mkdir data 2>/dev/null || true - @mkdir data/xsession 2>/dev/null || true - @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ - @chmod a+x $@ - -doc/openbox.1.in: Makefile $(srcdir)/doc/openbox.1.sgml +%.desktop: %.desktop.in Makefile @echo make: creating $@ - @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@ + @$(edit) $< >$@ -doc/openbox.1: Makefile doc/openbox.1.in +%-session: %-session.in Makefile @echo make: creating $@ - @mkdir doc 2>/dev/null || true - @$(edit) $(srcdir)/doc/openbox.1.in >$@ + @$(edit) $< >$@ -doc/openbox-gnome-session.1: Makefile doc/openbox-gnome-session.1.sgml +%.1.in: %.1.sgml @echo make: creating $@ - @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@ + @docbook-to-man $< >$@ -doc/openbox-kde-session.1: Makefile doc/openbox-kde-session.1.sgml +%.1: %.1.in Makefile @echo make: creating $@ - @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@ + @$(edit) $< >$@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop -dist_xsessions_DATA = \ +nodist_xsessions_DATA = \ data/xsession/openbox.desktop \ data/xsession/openbox-gnome.desktop \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - debian/changelog.in \ - debian/compat \ - debian/conffiles \ - debian/control \ - debian/copyright \ - debian/menu \ - debian/postinst \ - debian/postrm \ - debian/rules \ 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 \ + data/xsession/openbox-session.in \ data/xsession/openbox-gnome-session.in \ data/xsession/openbox-kde-session.in \ + doc/openbox.1.sgml \ + doc/openbox.1.in \ + doc/openbox-session.1.sgml \ + doc/openbox-session.1.in \ + doc/openbox-gnome-session.1.sgml \ + doc/openbox-gnome-session.1.in \ + doc/openbox-kde-session.1.sgml \ + doc/openbox-kde-session.1.in \ render/obrender-3.0.pc.in \ parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \ @@ -451,20 +423,44 @@ dist_doc_DATA = \ COMPLIANCE \ README \ AUTHORS \ + CHANGELOG \ + 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 \ doc/openbox-kde-session.1 EXTRA_DIST = \ + debian/changelog.in \ + debian/compat \ + debian/conffiles \ + debian/control \ + debian/copyright \ + debian/menu \ + debian/postinst \ + debian/postrm \ + debian/rules \ config.rpath \ - mkinstalldirs \ - CHANGELOG \ - COPYING + 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