X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=246abede9a430c7f057940ce402b22c42131a050;hb=fd77a0a7b3f892925f203287b8b46c6ec9be94ea;hp=770f587e30dae77483abfa00d33eb2d18cd2e9ef;hpb=1aac72bc4cfffdd816347d305624b15d0ae2112e;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 770f587e..246abede 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,11 @@ rcdir = $(configdir)/openbox xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig -pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox +appsdir = $(datadir)/applications theme = Clearlooks @@ -21,94 +23,85 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. check_PROGRAMS = \ - render/rendertest + obrender/rendertest lib_LTLIBRARIES = \ - parser/libobparser.la \ - render/libobrender.la \ - obt/libobt.la + obt/libobt.la \ + obrender/libobrender.la 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 nodist_bin_SCRIPTS = \ data/xsession/openbox-session \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -## render ## +dist_rc_SCRIPTS = \ + data/environment \ + data/autostart/autostart + +dist_libexec_SCRIPTS = \ + data/autostart/openbox-xdg-autostart \ + data/autostart/openbox-autostart + -render_rendertest_CPPFLAGS = \ +## obrender ## + +obrender_rendertest_CPPFLAGS = \ $(PANGO_CFLAGS) \ - $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" -render_rendertest_LDADD = \ - parser/libobparser.la \ - render/libobrender.la \ +obrender_rendertest_LDADD = \ + obt/libobt.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) \ + $(IMLIB2_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 = \ - parser/libobparser.la \ +obrender_libobrender_la_LIBADD = \ $(X_LIBS) \ $(PANGO_LIBS) \ - $(XFT_LIBS) \ $(GLIB_LIBS) \ + $(IMLIB2_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/instance.h \ - render/instance.c \ - render/mask.h \ - render/mask.c \ - render/render.h \ - render/render.c \ - render/theme.h \ - render/theme.c - -## parser ## - -parser_libobparser_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"ObParser\" \ - -DLOCALEDIR=\"$(localedir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DCONFIGDIR=\"$(configdir)\" -parser_libobparser_la_LDFLAGS = \ - -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) -parser_libobparser_la_LIBADD = \ - $(GLIB_LIBS) \ - $(XML_LIBS) -parser_libobparser_la_SOURCES = \ - parser/parse.h \ - parser/parse.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 ## @@ -119,6 +112,7 @@ obt_libobt_la_CPPFLAGS = \ $(XSHAPE_CFLAGS) \ $(XSYNC_CFLAGS) \ $(GLIB_CFLAGS) \ + $(XML_CFLAGS) \ -DG_LOG_DOMAIN=\"Obt\" \ -DLOCALEDIR=\"$(localedir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -131,18 +125,28 @@ obt_libobt_la_LIBADD = \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ $(XSYNC_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(XML_LIBS) obt_libobt_la_SOURCES = \ + obt/bsearch.h \ obt/display.h \ obt/display.c \ obt/internal.h \ obt/keyboard.h \ obt/keyboard.c \ - obt/mainloop.h \ - obt/mainloop.c \ + obt/xml.h \ + obt/xml.c \ + obt/ddparse.h \ + obt/ddparse.c \ + obt/link.h \ + obt/link.c \ + obt/paths.h \ + obt/paths.c \ obt/prop.h \ obt/prop.c \ - obt/util.h + obt/util.h \ + obt/xqueue.h \ + obt/xqueue.c ## openbox ## @@ -168,8 +172,7 @@ openbox_openbox_LDADD = \ $(XML_LIBS) \ $(EFENCE_LIBS) \ $(LIBINTL) \ - render/libobrender.la \ - parser/libobparser.la \ + obrender/libobrender.la \ obt/libobt.la openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ @@ -209,6 +212,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 \ @@ -256,8 +260,6 @@ 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 \ @@ -269,6 +271,8 @@ openbox_openbox_SOURCES = \ openbox/ping.h \ openbox/place.c \ openbox/place.h \ + openbox/prompt.c \ + openbox/prompt.h \ openbox/popup.c \ openbox/popup.h \ openbox/resist.c \ @@ -286,6 +290,7 @@ openbox_openbox_SOURCES = \ openbox/window.c \ openbox/window.h + ## gnome-panel-control ## tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ @@ -295,6 +300,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 = \ @@ -315,6 +342,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 @@ -386,44 +417,59 @@ dist_syscrash_theme_DATA= \ ## public headers ## -pubinclude_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 \ - parser/parse.h \ +rrpubinclude_HEADERS = \ + 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/link.h \ obt/display.h \ - obt/mainloop.h \ - obt/util.h - -nodist_pubinclude_HEADERS = \ - version.h + obt/keyboard.h \ + obt/xml.h \ + obt/paths.h \ + obt/prop.h \ + obt/util.h \ + obt/version.h \ + obt/xqueue.h nodist_pkgconfig_DATA = \ - render/obrender-4.0.pc \ - parser/obparser-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 dist_rc_DATA = \ - data/autostart.sh \ data/rc.xml \ data/menu.xml edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ -e 's!@configdir\@!$(configdir)!' \ + -e 's!@libexecdir\@!$(libexecdir)!' \ -e 's!@bindir\@!$(bindir)!' +data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + +data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + %.desktop: %.desktop.in Makefile @echo make: creating $@ @$(edit) $< >$@ @@ -449,9 +495,10 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - version.h.in \ data/rc.xsd \ data/menu.xsd \ + data/autostart/autostart.in \ + data/autostart/openbox-autostart.in \ data/xsession/openbox.desktop.in \ data/xsession/openbox-gnome.desktop.in \ data/xsession/openbox-kde.desktop.in \ @@ -466,9 +513,12 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/obrender-4.0.pc.in \ - parser/obparser-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 \ tests/Makefile \ @@ -501,7 +551,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 @@ -524,7 +575,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 \