X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=14786f57d9e225c2327209148d15c34584c30b54;hb=e65411aa0de52f8d2af1c22646e7a8397f7357b8;hp=baa62b3339aa029f7f67444b692edf81333f7bb4;hpb=96bb892054bb9801fd2b5b7959ee2cec27c075ea;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index baa62b33..14786f57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,8 @@ pkgconfigdir = $(libdir)/pkgconfig pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox +secretbindir = $(libdir)/openbox +appsdir = $(datadir)/applications theme = Clearlooks @@ -29,7 +31,12 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ - tools/gnome-panel-control/gnome-panel-control + tools/gdm-control/gdm-control \ + tools/gnome-panel-control/gnome-panel-control \ + tools/obxprop/obxprop + +dist_secretbin_SCRIPTS = \ + tools/xdg-autostart/xdg-autostart nodist_bin_SCRIPTS = \ data/xsession/openbox-session \ @@ -82,6 +89,8 @@ render_libobrender_la_SOURCES = \ render/icon.h \ render/image.h \ render/image.c \ + render/imagecache.h \ + render/imagecache.c \ render/instance.h \ render/instance.c \ render/mask.h \ @@ -148,8 +157,46 @@ 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/addremovedesktop.c \ + openbox/actions/breakchroot.c \ + openbox/actions/close.c \ + openbox/actions/cyclewindows.c \ + openbox/actions/debug.c \ + openbox/actions/decorations.c \ + openbox/actions/desktop.c \ + openbox/actions/dockautohide.c \ + openbox/actions/directionalwindows.c \ + openbox/actions/execute.c \ + openbox/actions/exit.c \ + openbox/actions/focus.c \ + openbox/actions/focustobottom.c \ + openbox/actions/fullscreen.c \ + openbox/actions/growtoedge.c \ + openbox/actions/iconify.c \ + openbox/actions/if.c \ + openbox/actions/kill.c \ + openbox/actions/layer.c \ + openbox/actions/lower.c \ + openbox/actions/maximize.c \ + openbox/actions/move.c \ + openbox/actions/moverelative.c \ + openbox/actions/moveresizeto.c \ + openbox/actions/movetoedge.c \ + openbox/actions/omnipresent.c \ + openbox/actions/raise.c \ + openbox/actions/raiselower.c \ + openbox/actions/reconfigure.c \ + openbox/actions/resize.c \ + openbox/actions/resizerelative.c \ + openbox/actions/restart.c \ + openbox/actions/shade.c \ + openbox/actions/showdesktop.c \ + openbox/actions/showmenu.c \ + openbox/actions/unfocus.c \ + openbox/actions.c \ + openbox/actions.h \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ @@ -205,14 +252,16 @@ openbox_openbox_SOURCES = \ openbox/mwm.h \ openbox/openbox.c \ openbox/openbox.h \ + openbox/ping.c \ + openbox/ping.h \ openbox/place.c \ openbox/place.h \ + openbox/prompt.c \ + openbox/prompt.h \ openbox/popup.c \ openbox/popup.h \ openbox/prop.c \ openbox/prop.h \ - openbox/propwin.c \ - openbox/propwin.h \ openbox/resist.c \ openbox/resist.h \ openbox/screen.c \ @@ -240,6 +289,28 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## obxprop ## + +tools_obxprop_obxprop_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(X_CFLAGS) +tools_obxprop_obxprop_LDADD = \ + $(GLIB_LIBS) \ + $(X_LIBS) +tools_obxprop_obxprop_SOURCES = \ + tools/obxprop/obxprop.c + +## gdm-control ## + +tools_gdm_control_gdm_control_CPPFLAGS = \ + $(X_CFLAGS) \ + $(GLIB_CFLAGS) +tools_gdm_control_gdm_control_LDADD = \ + $(X_LIBS) \ + $(GLIB_LIBS) +tools_gdm_control_gdm_control_SOURCES = \ + tools/gdm-control/gdm-control.c + ## default button masks ## dist_docxbm_DATA = \ @@ -260,6 +331,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 dist_clearlooks_theme_DATA= \ themes/Clearlooks/openbox-3/themerc +clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 +dist_clearlooks34_theme_DATA= \ + themes/Clearlooks-3.4/openbox-3/themerc + clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 dist_clearlooksolive_theme_DATA= \ themes/Clearlooks-Olive/openbox-3/themerc @@ -313,6 +388,14 @@ orang_themedir = $(themedir)/Orang/openbox-3 dist_orang_theme_DATA= \ 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= \ themes/Syscrash/openbox-3/max_disabled.xbm \ @@ -344,19 +427,29 @@ nodist_pkgconfig_DATA = \ ## data ## +dist_apps_DATA = \ + data/openbox.desktop + dist_pixmap_DATA = \ data/openbox.png +nodist_rc_DATA = \ + data/autostart.sh + dist_rc_DATA = \ - data/autostart.sh \ data/rc.xml \ data/menu.xml edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ -e 's!@configdir\@!$(configdir)!' \ + -e 's!@secretbindir\@!$(secretbindir)!' \ -e 's!@bindir\@!$(bindir)!' +data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + %.desktop: %.desktop.in Makefile @echo make: creating $@ @$(edit) $< >$@ @@ -383,6 +476,7 @@ nodist_xsessions_DATA = \ dist_noinst_DATA = \ version.h.in \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ @@ -399,6 +493,8 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ + doc/obxprop.1.sgml \ + doc/obxprop.1.in \ render/obrender-3.0.pc.in \ parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \ @@ -436,17 +532,7 @@ nodist_man_MANS = \ 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 + config.rpath # make clean doesn't delete these for some reason, even though they are # built by make