X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=a30248eb43943070eb3be346cd796563dc64e17e;hb=a76e91eb2a514dbd35ad9a9a81308acc7fc5bd89;hp=be621a079bc5746ae4a791a752186abf4f58e157;hpb=e6fba914766dc9d41c6da88a9f8803567e2078c4;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index be621a07..a30248eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,14 +4,14 @@ themedir = $(datadir)/themes localedir = $(datadir)/locale configdir = $(sysconfdir)/xdg rcdir = $(configdir)/openbox -desktopfilesdir = $(datadir)/gnome/wm-properties +xsessionsdir = $(datadir)/xsessions +gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox -userscriptdir = $(datadir)/openbox -theme = bear2 +theme = Clearlooks AUTOMAKE_OPTIONS = subdir-objects foreign @@ -28,9 +28,17 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ - tools/themetoxml/themetoxml \ tools/gnome-panel-control/gnome-panel-control +bin_SCRIPTS = \ + data/xsession/openbox-gnome-session \ + data/xsession/openbox-kde-session \ + data/xsession/openbox-gnome \ + data/xsession/openbox-kde + +noinst_PROGRAMS = \ + tools/themetoxml/themetoxml + ## render ## render_rendertest_CPPFLAGS = \ @@ -103,7 +111,14 @@ parser_libobparser_la_SOURCES = \ ## openbox ## openbox_openbox_CPPFLAGS = \ + $(SM_CFLAGS) \ + $(XINERAMA_CFLAGS) \ + $(XKB_CFLAGS) \ + $(XRANDR_CFLAGS) \ + $(XSHAPE_CFLAGS) \ + $(XSYNC_CFLAGS) \ $(X_CFLAGS) \ + $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ $(PANGO_CFLAGS) \ $(GLIB_CFLAGS) \ @@ -119,8 +134,10 @@ openbox_openbox_LDADD = \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ + $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ $(XML_LIBS) \ $(EFENCE_LIBS) \ @@ -135,6 +152,7 @@ openbox_openbox_SOURCES = \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ + openbox/client_list_menu.h \ openbox/client_list_combined_menu.c \ openbox/client_list_combined_menu.h \ openbox/client_menu.c \ @@ -171,6 +189,8 @@ openbox_openbox_SOURCES = \ openbox/menu.c \ openbox/menu.h \ openbox/misc.h \ + openbox/modkeys.c \ + openbox/modkeys.h \ openbox/mouse.c \ openbox/mouse.h \ openbox/moveresize.c \ @@ -214,7 +234,6 @@ tools_themetoxml_themetoxml_LDADD = \ $(XML_LIBS) tools_themetoxml_themetoxml_SOURCES = \ tools/themetoxml/themetoxml.c \ - tools/themetoxml/themetoxml.h \ tools/themetoxml/rgb.h @@ -230,6 +249,28 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ ## themes ## +clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 +dist_clearlooks_theme_DATA= \ + themes/Clearlooks/openbox-3/bullet.xbm \ + themes/Clearlooks/openbox-3/close.xbm \ + themes/Clearlooks/openbox-3/desk_toggled.xbm \ + themes/Clearlooks/openbox-3/desk.xbm \ + themes/Clearlooks/openbox-3/iconify.xbm \ + themes/Clearlooks/openbox-3/max_toggled.xbm \ + themes/Clearlooks/openbox-3/max.xbm \ + themes/Clearlooks/openbox-3/themerc.xml + +clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 +dist_clearlooksolive_theme_DATA= \ + themes/Clearlooks-Olive/openbox-3/bullet.xbm \ + themes/Clearlooks-Olive/openbox-3/close.xbm \ + themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \ + themes/Clearlooks-Olive/openbox-3/desk.xbm \ + themes/Clearlooks-Olive/openbox-3/iconify.xbm \ + themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \ + themes/Clearlooks-Olive/openbox-3/max.xbm \ + themes/Clearlooks-Olive/openbox-3/themerc.xml + mikachu_themedir = $(themedir)/Mikachu/openbox-3 dist_mikachu_theme_DATA= \ themes/Mikachu/openbox-3/bullet.xbm \ @@ -237,7 +278,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 + themes/Mikachu/openbox-3/themerc.xml natura_themedir = $(themedir)/Natura/openbox-3 @@ -254,54 +295,53 @@ dist_natura_theme_DATA= \ themes/Natura/openbox-3/max_toggled.xbm \ themes/Natura/openbox-3/max.xbm \ themes/Natura/openbox-3/shade.xbm \ - themes/Natura/openbox-3/themerc + themes/Natura/openbox-3/themerc.xml -artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3 +artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 dist_artwizboxed_theme_DATA= \ - themes/artwiz-boxed/openbox-3/bullet.xbm \ - themes/artwiz-boxed/openbox-3/close.xbm \ - themes/artwiz-boxed/openbox-3/desk_toggled.xbm \ - themes/artwiz-boxed/openbox-3/desk.xbm \ - themes/artwiz-boxed/openbox-3/iconify.xbm \ - themes/artwiz-boxed/openbox-3/max_toggled.xbm \ - themes/artwiz-boxed/openbox-3/max.xbm \ - themes/artwiz-boxed/openbox-3/themerc - -bear2_themedir = $(themedir)/bear2/openbox-3 + themes/Artwiz-boxed/openbox-3/close.xbm \ + themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \ + themes/Artwiz-boxed/openbox-3/desk.xbm \ + themes/Artwiz-boxed/openbox-3/iconify.xbm \ + themes/Artwiz-boxed/openbox-3/max_toggled.xbm \ + themes/Artwiz-boxed/openbox-3/max.xbm \ + themes/Artwiz-boxed/openbox-3/themerc.xml + +bear2_themedir = $(themedir)/Bear2/openbox-3 dist_bear2_theme_DATA= \ - themes/bear2/openbox-3/close_pressed.xbm \ - themes/bear2/openbox-3/close.xbm \ - themes/bear2/openbox-3/desk_toggled.xbm \ - themes/bear2/openbox-3/desk.xbm \ - themes/bear2/openbox-3/iconify_disabled.xbm \ - themes/bear2/openbox-3/iconify_pressed.xbm \ - themes/bear2/openbox-3/iconify.xbm \ - themes/bear2/openbox-3/max_disabled.xbm \ - themes/bear2/openbox-3/max_pressed.xbm \ - themes/bear2/openbox-3/max_toggled.xbm \ - themes/bear2/openbox-3/max.xbm \ - themes/bear2/openbox-3/shade_pressed.xbm \ - themes/bear2/openbox-3/shade.xbm \ - themes/bear2/openbox-3/themerc - -orang_themedir = $(themedir)/orang/openbox-3 + themes/Bear2/openbox-3/close_pressed.xbm \ + themes/Bear2/openbox-3/close.xbm \ + themes/Bear2/openbox-3/desk_toggled.xbm \ + themes/Bear2/openbox-3/desk.xbm \ + themes/Bear2/openbox-3/iconify_disabled.xbm \ + themes/Bear2/openbox-3/iconify_pressed.xbm \ + themes/Bear2/openbox-3/iconify.xbm \ + themes/Bear2/openbox-3/max_disabled.xbm \ + themes/Bear2/openbox-3/max_pressed.xbm \ + themes/Bear2/openbox-3/max_toggled.xbm \ + 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 + +orang_themedir = $(themedir)/Orang/openbox-3 dist_orang_theme_DATA= \ - themes/orang/openbox-3/themerc + themes/Orang/openbox-3/themerc.xml -syscrash_themedir = $(themedir)/syscrash/openbox-3 +syscrash_themedir = $(themedir)/Syscrash/openbox-3 dist_syscrash_theme_DATA= \ - themes/syscrash/openbox-3/bullet.xbm \ - themes/syscrash/openbox-3/close_disabled.xbm \ - themes/syscrash/openbox-3/close.xbm \ - themes/syscrash/openbox-3/desk_toggled.xbm \ - themes/syscrash/openbox-3/desk.xbm \ - themes/syscrash/openbox-3/iconify.xbm \ - themes/syscrash/openbox-3/max_disabled.xbm \ - themes/syscrash/openbox-3/max_pressed.xbm \ - themes/syscrash/openbox-3/max_toggled.xbm \ - themes/syscrash/openbox-3/max.xbm \ - themes/syscrash/openbox-3/shade.xbm \ - themes/syscrash/openbox-3/themerc + themes/Syscrash/openbox-3/bullet.xbm \ + themes/Syscrash/openbox-3/close_disabled.xbm \ + themes/Syscrash/openbox-3/close.xbm \ + themes/Syscrash/openbox-3/desk_toggled.xbm \ + themes/Syscrash/openbox-3/desk.xbm \ + themes/Syscrash/openbox-3/iconify.xbm \ + themes/Syscrash/openbox-3/max_disabled.xbm \ + themes/Syscrash/openbox-3/max_pressed.xbm \ + themes/Syscrash/openbox-3/max_toggled.xbm \ + themes/Syscrash/openbox-3/max.xbm \ + themes/Syscrash/openbox-3/shade.xbm \ + themes/Syscrash/openbox-3/themerc.xml ## public headers ## @@ -333,10 +373,6 @@ 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)!' @@ -353,21 +389,42 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data @mkdir data 2>/dev/null || true @$(edit) $(srcdir)/data/menu.xml.in >$@ -dist_userscript_DATA = \ - tools/themeupdate/themeupdate.py +dist_gnomewmfiles_DATA = \ + data/gnome-wm-properties/openbox.desktop \ + data/gnome-wm-properties/openbox-gnome.desktop \ + data/gnome-wm-properties/openbox-kde.desktop -install-data-hook: - chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py - -dist_desktopfiles_DATA = \ - data/openbox.desktop +dist_xsessions_DATA = \ + data/xsession/openbox.desktop \ + data/xsession/openbox-gnome.desktop \ + data/xsession/openbox-kde.desktop dist_noinst_DATA = \ version.h.in \ + data/rc.xsd \ + data/menu.xsd \ + data/themerc.xsd \ data/rc.xml.in \ data/menu.xml.in \ render/obrender-3.0.pc.in \ - parser/obparser-3.0.pc.in + parser/obparser-3.0.pc.in \ + tools/themeupdate/themeupdate.py \ + tests/hideshow.py \ + tests/Makefile \ + tests/aspect.c \ + tests/fullscreen.c \ + tests/grav.c \ + tests/grouptran.c \ + tests/icons.c \ + tests/modal2.c \ + tests/modal3.c \ + tests/modal.c \ + tests/noresize.c \ + tests/override.c \ + tests/positioned.c \ + tests/strut.c \ + tests/title.c \ + tests/urgent.c EXTRA_DIST = \ config.rpath \