X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=c60389af5a3a760a642451123d60bf1a537b6895;hb=6014a41760a107d817422aa5412ccf0ce3fc6e92;hp=00d7998ae91a169d967d20d4d0bd2573784ebde8;hpb=ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 00d7998a..c60389af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,10 +9,11 @@ xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt -rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox secretbindir = $(libdir)/openbox +appsdir = $(datadir)/applications theme = Clearlooks @@ -23,16 +24,17 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. check_PROGRAMS = \ - render/rendertest + obrender/rendertest lib_LTLIBRARIES = \ obt/libobt.la \ - render/libobrender.la + obrender/libobrender.la bin_PROGRAMS = \ openbox/openbox \ tools/gdm-control/gdm-control \ - tools/gnome-panel-control/gnome-panel-control + tools/gnome-panel-control/gnome-panel-control \ + tools/obxprop/obxprop dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart @@ -42,62 +44,58 @@ nodist_bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -## render ## +## obrender ## -render_rendertest_CPPFLAGS = \ +obrender_rendertest_CPPFLAGS = \ $(PANGO_CFLAGS) \ - $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" -render_rendertest_LDADD = \ +obrender_rendertest_LDADD = \ obt/libobt.la \ - render/libobrender.la \ + obrender/libobrender.la \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ - $(XFT_LIBS) \ $(XML_LIBS) \ $(X_LIBS) -render_rendertest_SOURCES = render/test.c +obrender_rendertest_SOURCES = obrender/test.c -render_libobrender_la_CPPFLAGS = \ +obrender_libobrender_la_CPPFLAGS = \ $(X_CFLAGS) \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ - $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" -render_libobrender_la_LDFLAGS = \ +obrender_libobrender_la_LDFLAGS = \ -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) -render_libobrender_la_LIBADD = \ +obrender_libobrender_la_LIBADD = \ obt/libobt.la \ $(X_LIBS) \ $(PANGO_LIBS) \ - $(XFT_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) -render_libobrender_la_SOURCES = \ +obrender_libobrender_la_SOURCES = \ gettext.h \ - render/color.h \ - render/color.c \ - render/font.h \ - render/font.c \ - render/geom.h \ - render/gradient.h \ - render/gradient.c \ - render/icon.h \ - render/image.h \ - render/image.c \ - render/imagecache.h \ - render/imagecache.c \ - render/instance.h \ - render/instance.c \ - render/mask.h \ - render/mask.c \ - render/render.h \ - render/render.c \ - render/theme.h \ - render/theme.c + obrender/color.h \ + obrender/color.c \ + obrender/font.h \ + obrender/font.c \ + obrender/geom.h \ + obrender/gradient.h \ + obrender/gradient.c \ + obrender/icon.h \ + obrender/image.h \ + obrender/image.c \ + obrender/imagecache.h \ + obrender/imagecache.c \ + obrender/instance.h \ + obrender/instance.c \ + obrender/mask.h \ + obrender/mask.c \ + obrender/render.h \ + obrender/render.c \ + obrender/theme.h \ + obrender/theme.c ## obt ## @@ -131,8 +129,8 @@ obt_libobt_la_SOURCES = \ obt/keyboard.c \ obt/mainloop.h \ obt/mainloop.c \ - obt/parse.h \ - obt/parse.c \ + obt/xml.h \ + obt/xml.c \ obt/paths.h \ obt/paths.c \ obt/prop.h \ @@ -152,6 +150,7 @@ openbox_openbox_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(LIBSN_CFLAGS) \ $(XML_CFLAGS) \ + $(IMLIB2_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ -DDATADIR=\"$(datadir)\" \ -DCONFIGDIR=\"$(configdir)\" \ @@ -165,7 +164,8 @@ openbox_openbox_LDADD = \ $(XML_LIBS) \ $(EFENCE_LIBS) \ $(LIBINTL) \ - render/libobrender.la \ + $(IMLIB2_LIBS) \ + obrender/libobrender.la \ obt/libobt.la openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ @@ -191,7 +191,6 @@ openbox_openbox_SOURCES = \ openbox/actions/if.c \ openbox/actions/kill.c \ openbox/actions/layer.c \ - openbox/actions/session.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ openbox/actions/move.c \ @@ -206,6 +205,7 @@ openbox_openbox_SOURCES = \ openbox/actions/resizerelative.c \ openbox/actions/restart.c \ openbox/actions/shade.c \ + openbox/actions/shadelowerraise.c \ openbox/actions/showdesktop.c \ openbox/actions/showmenu.c \ openbox/actions/unfocus.c \ @@ -244,8 +244,6 @@ openbox_openbox_SOURCES = \ openbox/grab.h \ openbox/group.c \ openbox/group.h \ - openbox/hooks.c \ - openbox/hooks.h \ openbox/keyboard.c \ openbox/keyboard.h \ openbox/keytree.c \ @@ -285,6 +283,7 @@ openbox_openbox_SOURCES = \ openbox/window.c \ openbox/window.h + ## gnome-panel-control ## tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ @@ -294,6 +293,17 @@ 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 = \ @@ -401,22 +411,22 @@ dist_syscrash_theme_DATA= \ ## public headers ## rrpubinclude_HEADERS = \ - render/color.h \ - render/font.h \ - render/geom.h \ - render/gradient.h \ - render/image.h \ - render/instance.h \ - render/mask.h \ - render/render.h \ - render/theme.h \ - render/version.h + obrender/color.h \ + obrender/font.h \ + obrender/geom.h \ + obrender/gradient.h \ + obrender/image.h \ + obrender/instance.h \ + obrender/mask.h \ + obrender/render.h \ + obrender/theme.h \ + obrender/version.h obtpubinclude_HEADERS = \ obt/display.h \ obt/keyboard.h \ obt/mainloop.h \ - obt/parse.h \ + obt/xml.h \ obt/paths.h \ obt/prop.h \ obt/util.h \ @@ -424,11 +434,14 @@ obtpubinclude_HEADERS = \ obt/xevent.h nodist_pkgconfig_DATA = \ - render/obrender-4.0.pc \ - obt/obt-4.0.pc + obrender/obrender-3.5.pc \ + obt/obt-3.5.pc ## data ## +dist_apps_DATA = \ + data/openbox.desktop + dist_pixmap_DATA = \ data/openbox.png @@ -491,9 +504,11 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/version.h.in \ - render/obrender-4.0.pc.in \ - obt/obt-4.0.pc.in \ + doc/obxprop.1.sgml \ + doc/obxprop.1.in \ + obrender/version.h.in \ + obrender/obrender-3.5.pc.in \ + obt/obt-3.5.pc.in \ obt/version.h.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ @@ -527,7 +542,8 @@ nodist_man_MANS = \ doc/openbox.1 \ doc/openbox-session.1 \ doc/openbox-gnome-session.1 \ - doc/openbox-kde-session.1 + doc/openbox-kde-session.1 \ + doc/obxprop.1 EXTRA_DIST = \ config.rpath @@ -550,7 +566,7 @@ CLEANFILES = \ # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc distclean-local: - for d in . m4 po render parser obt openbox; do \ + for d in . m4 po obrender parser obt openbox; do \ for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \ rm -f "$$d/$$p"; \ done \