From 0b953668f7c69c981b6b88e6c1b5e59f27acf527 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Wed, 15 Oct 2008 18:58:37 -0400 Subject: [PATCH] Move launcher into demos/ --- Makefile.am | 2 +- champlain/Makefile.am | 4 - configure.ac | 1 + demos/Makefile.am | 8 ++ demos/launcher | 131 ++++++++++++++++++++++++++++++++ {champlain => demos}/launcher.c | 2 +- 6 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 demos/Makefile.am create mode 100755 demos/launcher rename {champlain => demos}/launcher.c (98%) diff --git a/Makefile.am b/Makefile.am index 605f4fb..8956a6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tidy champlain docs/reference +SUBDIRS = tidy champlain demos docs/reference pcfiles = champlain-1.0.pc diff --git a/champlain/Makefile.am b/champlain/Makefile.am index 5d6fb10..e515bab 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -53,12 +53,8 @@ libchamplain_include_HEADERS = champlain.h champlainview.h champlain_defines.h c libchamplain_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION) -noinst_PROGRAMS = launcher - AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir) AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.* -launcher_SOURCES = launcher.c -launcher_LDADD = $(DEPS_LIBS) libchamplain-1.0.la svgdir = $(datadir)/champlain svg_DATA = error.svg diff --git a/configure.ac b/configure.ac index b48b38c..6dee7a8 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,7 @@ GTK_DOC_CHECK(1.9) AC_CONFIG_FILES([Makefile champlain/Makefile + demos/Makefile tidy/Makefile docs/reference/Makefile docs/reference/version.xml diff --git a/demos/Makefile.am b/demos/Makefile.am new file mode 100644 index 0000000..6764ea9 --- /dev/null +++ b/demos/Makefile.am @@ -0,0 +1,8 @@ + +noinst_PROGRAMS = launcher + +AM_CPPFLAGS = $(DEPS_CFLAGS) +AM_LDFLAGS = $(DEPS_LIBS) + +launcher_SOURCES = launcher.c +launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-1.0.la diff --git a/demos/launcher b/demos/launcher new file mode 100755 index 0000000..f8fb218 --- /dev/null +++ b/demos/launcher @@ -0,0 +1,131 @@ +#! /bin/sh + +# launcher - temporary wrapper script for .libs/launcher +# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-4 (1.1220.2.493 2008/02/01 16:58:18) +# +# The launcher program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='/bin/sed -e 1s/^X//' +sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' + +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command="(cd /home/pierlux/champlain/libchamplain/demos; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/games\"; export PATH; gcc -Wall -Wextra -Wno-unused-parameter -pthread -Wl,--export-dynamic -o \$progdir/\$file launcher.o -pthread -Wl,--export-dynamic /usr/lib/libgdk-x11-2.0.so -lclutter-cairo-0.8 -lclutter-glx-0.8 /usr/lib/libpangocairo-1.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libgdk_pixbuf_xlib-2.0.so /usr/lib/libpango-1.0.so /usr/lib/libgdk_pixbuf-2.0.so -lm /usr/lib/libcairo.so -lsoup-2.4 /usr/lib/libgio-2.0.so /usr/lib/libgobject-2.0.so /usr/lib/libgmodule-2.0.so -ldl /usr/lib/libglib-2.0.so ../champlain/.libs/libchamplain-1.0.so -Wl,--rpath -Wl,/home/pierlux/champlain/libchamplain/champlain/.libs ) " + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variable: + notinst_deplibs=' ../champlain/libchamplain-1.0.la' +else + # When we are sourced in execute mode, $file and $echo are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + echo="echo" + file="$0" + # Make sure echo works. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : + else + # Restart under the correct shell, and then maybe $echo will work. + exec /bin/sh "$0" --no-reexec ${1+"$@"} + fi + fi + + # Find the directory that this script lives in. + thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` + done + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program=lt-'launcher' + progdir="$thisdir/.libs" + + if test ! -f "$progdir/$program" || \ + { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ + test "X$file" != "X$progdir/$program"; }; then + + file="$$-$program" + + if test ! -d "$progdir"; then + mkdir "$progdir" + else + rm -f "$progdir/$file" + fi + + # relink executable if necessary + if test -n "$relink_command"; then + if relink_command_output=`eval $relink_command 2>&1`; then : + else + echo "$relink_command_output" >&2 + rm -f "$progdir/$file" + exit 1 + fi + fi + + mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || + { rm -f "$progdir/$program"; + mv -f "$progdir/$file" "$progdir/$program"; } + rm -f "$progdir/$file" + fi + + if test -f "$progdir/$program"; then + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + + exec "$progdir/$program" ${1+"$@"} + + $echo "$0: cannot exec $program $*" + exit 1 + fi + else + # The program doesn't exist. + $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 + $echo "This script is just a wrapper for $program." 1>&2 + echo "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi diff --git a/champlain/launcher.c b/demos/launcher.c similarity index 98% rename from champlain/launcher.c rename to demos/launcher.c index 2ad6ba5..958c80b 100644 --- a/champlain/launcher.c +++ b/demos/launcher.c @@ -18,7 +18,7 @@ #include -#include +#include static gboolean montreal_click (ClutterActor *actor, -- 2.39.5