From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Wed, 15 Oct 2008 22:58:24 +0000 (-0400)
Subject: Move launcher into demos/
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d1b707a28b231c6a128b698c05470a705adfe6;p=libchamplain

Move launcher into demos/
---

diff --git a/Makefile.am b/Makefile.am
index c6fdc5b..5d2dac3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = champlain-gtk docs/reference
+SUBDIRS = champlain-gtk demos docs/reference
 
 pcfiles = champlain-gtk-1.0.pc
 
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 989c36a..370a539 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -29,11 +29,7 @@ libchamplain_include_HEADERS = champlainviewembed.h
 
 libchamplain_gtk_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
-noinst_PROGRAMS = launcher
-
 AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
-launcher_SOURCES = launcher.c
-launcher_LDADD = $(DEPS_LIBS) libchamplain-gtk-1.0.la
 
 EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LIST)
diff --git a/configure.ac b/configure.ac
index e4737a8..168ce99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
 PKG_CHECK_MODULES(DEPS,
-  [    gtk+-2.0 >= 2.2,
+  [   gtk+-2.0 >= 2.2,
       clutter-0.8 >= 0.8,
       clutter-gtk-0.8 >= 0.8,
       champlain-1.0 >= 0.2
@@ -36,6 +36,7 @@ GTK_DOC_CHECK(1.9)
 
 AC_CONFIG_FILES([Makefile
                  champlain-gtk/Makefile
+                 demos/Makefile
                  docs/reference/Makefile
                  docs/reference/version.xml
                  champlain-gtk.pc])
diff --git a/demos/Makefile.am b/demos/Makefile.am
new file mode 100644
index 0000000..54f34f3
--- /dev/null
+++ b/demos/Makefile.am
@@ -0,0 +1,6 @@
+noinst_PROGRAMS = launcher
+
+AM_CPPFLAGS = $(DEPS_CFLAGS) 
+AM_LDFLAGS = $(DEPS_LIBS) 
+launcher_SOURCES = launcher.c
+launcher_LDADD = $(DEPS_LIBS) ../champlain-gtk/libchamplain-gtk-1.0.la
diff --git a/demos/launcher b/demos/launcher
new file mode 100755
index 0000000..b981062
--- /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-gtk/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 -Werror -Wno-unused-parameter -pthread -Wl,--export-dynamic -o \$progdir/\$file launcher.o -pthread -Wl,--export-dynamic  /usr/lib/libclutter-gtk-0.8.so /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libchamplain-1.0.so -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/libcairo.so /usr/lib/libgdk_pixbuf-2.0.so -lm /usr/lib/libgobject-2.0.so /usr/lib/libgmodule-2.0.so -ldl /usr/lib/libglib-2.0.so ../champlain-gtk/.libs/libchamplain-gtk-1.0.so  -Wl,--rpath -Wl,/home/pierlux/champlain/libchamplain-gtk/champlain-gtk/.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-gtk/libchamplain-gtk-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-gtk/launcher.c b/demos/launcher.c
similarity index 100%
rename from champlain-gtk/launcher.c
rename to demos/launcher.c