From c05a323882036b1c874e1b7c379db8fc80ff1171 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 4 Jul 2005 08:18:22 +0000 Subject: [PATCH] configure.in build the doc-shooter utility conditionally and explicitely 2005-07-04 Sven Neumann * configure.in * devel-docs/tools/Makefile.am: build the doc-shooter utility conditionally and explicitely link it with -lX11. --- configure.in | 4 ++++ devel-docs/tools/Makefile.am | 8 ++++++-- devel-docs/tools/README.shooter | 9 ++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index a28fa4c1c1..1e86be153c 100644 --- a/configure.in +++ b/configure.in @@ -874,6 +874,9 @@ if test "$gdk_target" = x11; then dnl screenshot plug-in needs to link to X11 explicitely LIBSCREENSHOT="$X_LIBS -lX11" + dnl doc-shooter is X11 specific + DOC_SHOOTER=doc-shooter + dnl Test for Xmu if test -z "$LIBXMU"; then gimp_save_CFLAGS="$CFLAGS" @@ -897,6 +900,7 @@ fi AC_SUBST(LIBXMU) AC_SUBST(LIBSCREENSHOT) AC_SUBST(GIMP_REMOTE) +AC_SUBST(DOC_SHOOTER) ################### diff --git a/devel-docs/tools/Makefile.am b/devel-docs/tools/Makefile.am index a5562d41d1..1c78165ab5 100644 --- a/devel-docs/tools/Makefile.am +++ b/devel-docs/tools/Makefile.am @@ -19,9 +19,13 @@ LDADDS = \ $(libgimpmath) \ $(libgimpcolor) \ $(libgimpbase) \ - $(GTK_LIBS) + $(GTK_LIBS) \ + $(X_LIBS) -lX11 -noinst_PROGRAMS = doc-shooter + +noinst_PROGRAMS = $(DOC_SHOOTER) + +EXTRA_PROGRAMS = doc-shooter doc_shooter_SOURCES = \ shadow.c \ diff --git a/devel-docs/tools/README.shooter b/devel-docs/tools/README.shooter index de244534c4..53a905cc2e 100644 --- a/devel-docs/tools/README.shooter +++ b/devel-docs/tools/README.shooter @@ -1,10 +1,9 @@ The doc-shooter is a small utility used to create screenshots of -widgets for the GIMP API reference manuals. This utility isn't -built by default, you need to explicitely compile it using +widgets for the GIMP API reference manuals. This utility is X11 +specific, so it should only be built when GIMP is being compiled +for the X11 GDK backend. - make doc-shooter - -Taking the screenshots is also not part of the docs build. +Taking the screenshots is not part of the docs build. Instead, the images are created, and then copied by hand into devel-docs/libgimpwidgets/images. Ideally, the images should be taken once a release, and all images should be updated at the