X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=45a3bd2f9d66c04be5001840c2b020c27b21ef7d;hb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;hp=0c5d7cc8edfffec28e5b8afb9bb2a10cf6167630;hpb=2464e593300f677ed5dc953a36f25b84edfd07ae;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 0c5d7cc8..45a3bd2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,12 @@ 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 +secretbindir = $(libdir)/openbox +appsdir = $(datadir)/applications theme = Clearlooks @@ -21,103 +24,125 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. check_PROGRAMS = \ - render/rendertest + obrender/rendertest lib_LTLIBRARIES = \ - parser/libobparser.la \ - render/libobrender.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 + +dist_secretbin_SCRIPTS = \ + tools/xdg-autostart/xdg-autostart nodist_bin_SCRIPTS = \ data/xsession/openbox-session \ 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 = \ - 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) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" -render_libobrender_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -render_libobrender_la_LIBADD = \ - parser/libobparser.la \ +obrender_libobrender_la_LDFLAGS = \ + -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) +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/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 = \ + 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 ## + +obt_libobt_la_CPPFLAGS = \ + $(XINERAMA_CFLAGS) \ + $(XKB_CFLAGS) \ + $(XRANDR_CFLAGS) \ + $(XSHAPE_CFLAGS) \ + $(XSYNC_CFLAGS) \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ - -DG_LOG_DOMAIN=\"ObParser\" \ + -DG_LOG_DOMAIN=\"Obt\" \ -DLOCALEDIR=\"$(localedir)\" \ -DDATADIR=\"$(datadir)\" \ -DCONFIGDIR=\"$(configdir)\" -parser_libobparser_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -parser_libobparser_la_LIBADD = \ +obt_libobt_la_LDFLAGS = \ + -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE) +obt_libobt_la_LIBADD = \ + $(XINERAMA_LIBS) \ + $(XKB_LIBS) \ + $(XRANDR_LIBS) \ + $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ - $(XML_LIBS) -parser_libobparser_la_SOURCES = \ - parser/parse.h \ - parser/parse.c + $(XML_LIBS) +obt_libobt_la_SOURCES = \ + 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/paths.h \ + obt/paths.c \ + obt/prop.h \ + obt/prop.c \ + obt/util.h \ + obt/xevent.h \ + obt/xevent.c ## openbox ## openbox_openbox_CPPFLAGS = \ $(SM_CFLAGS) \ - $(XINERAMA_CFLAGS) \ - $(XKB_CFLAGS) \ - $(XRANDR_CFLAGS) \ - $(XSHAPE_CFLAGS) \ - $(XSYNC_CFLAGS) \ $(X_CFLAGS) \ $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ @@ -131,11 +156,6 @@ openbox_openbox_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ - $(XINERAMA_LIBS) \ - $(XKB_LIBS) \ - $(XRANDR_LIBS) \ - $(XSHAPE_LIBS) \ - $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ @@ -143,8 +163,8 @@ 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 = \ gettext.h \ @@ -158,11 +178,11 @@ openbox_openbox_SOURCES = \ openbox/actions/decorations.c \ openbox/actions/desktop.c \ openbox/actions/dockautohide.c \ - openbox/actions/directionalcyclewindows.c \ - openbox/actions/directionaltargetwindow.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 \ @@ -171,7 +191,6 @@ openbox_openbox_SOURCES = \ openbox/actions/layer.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ - openbox/actions/menu.c \ openbox/actions/move.c \ openbox/actions/moverelative.c \ openbox/actions/moveresizeto.c \ @@ -184,7 +203,9 @@ 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 \ openbox/actions.c \ openbox/actions.h \ @@ -204,8 +225,6 @@ openbox_openbox_SOURCES = \ openbox/dock.h \ openbox/event.c \ openbox/event.h \ - openbox/extensions.c \ - openbox/extensions.h \ openbox/focus.c \ openbox/focus.h \ openbox/focus_cycle.c \ @@ -227,15 +246,11 @@ openbox_openbox_SOURCES = \ openbox/keyboard.h \ openbox/keytree.c \ openbox/keytree.h \ - openbox/mainloop.c \ - openbox/mainloop.h \ openbox/menuframe.c \ openbox/menuframe.h \ openbox/menu.c \ openbox/menu.h \ openbox/misc.h \ - openbox/modkeys.c \ - openbox/modkeys.h \ openbox/mouse.c \ openbox/mouse.h \ openbox/moveresize.c \ @@ -243,14 +258,14 @@ 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 \ @@ -264,10 +279,7 @@ openbox_openbox_SOURCES = \ openbox/translate.c \ openbox/translate.h \ openbox/window.c \ - openbox/window.h \ - openbox/xerror.c \ - openbox/xerror.h - + openbox/window.h ## gnome-panel-control ## @@ -278,6 +290,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 = \ @@ -298,6 +332,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 @@ -369,40 +407,58 @@ 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 - -nodist_pubinclude_HEADERS = \ - version.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/display.h \ + obt/keyboard.h \ + obt/mainloop.h \ + obt/xml.h \ + obt/paths.h \ + obt/prop.h \ + obt/util.h \ + obt/version.h \ + obt/xevent.h nodist_pkgconfig_DATA = \ - render/obrender-3.0.pc \ - parser/obparser-3.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 +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) $< >$@ @@ -428,7 +484,7 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - version.h.in \ + data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ @@ -445,8 +501,10 @@ dist_noinst_DATA = \ 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 \ + 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 \ @@ -482,8 +540,7 @@ nodist_man_MANS = \ doc/openbox-kde-session.1 EXTRA_DIST = \ - config.rpath \ - mkinstalldirs + config.rpath # make clean doesn't delete these for some reason, even though they are # built by make @@ -503,7 +560,7 @@ CLEANFILES = \ # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc distclean-local: - for d in . m4 po render; 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 \