[gnome-shell/wip/wayland: 364/376] Remove the jhbuild wrapper script

[Giovanni Campagna <gcampagna src gnome org>]

commit 45ab9954c9fa0aa033984adf55345080f7989d70
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Fri Aug 16 15:07:03 2013 +0200

    Remove the jhbuild wrapper script
    
    It's mostly equivalent to "jhbuild run gnome-shell", which is
    the preferred way. Also, running from the source tree can't be
    supported at this point, and the wrapper is getting in the way
    of having two binaries, one for wayland and one for X11.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705497

 configure.ac               |    4 -
 src/Makefile.am            |   32 +-------
 src/gnome-shell-jhbuild.in |  175 --------------------------------------------
 3 files changed, 5 insertions(+), 206 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4e25a49..b0cfef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,10 +174,6 @@ AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
 GNOME_COMPILE_WARNINGS([error])
 
-AC_ARG_ENABLE(jhbuild-wrapper-script,
-  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for 
jhbuild]),,enable_jhbuild_wrapper_script=no)
-AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
-
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a5e74b9..e95a5a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,23 +33,7 @@ bin_SCRIPTS += gnome-shell-extension-tool gnome-shell-extension-prefs \
               gnome-shell-perf-tool
 EXTRA_DIST += gnome-shell-extension-tool.in gnome-shell-extension-prefs.in \
              gnome-shell-perf-tool.in
-bin_PROGRAMS = gnome-shell-real
-
-if USE_JHBUILD_WRAPPER_SCRIPT
-gnome_shell = gnome-shell-jhbuild
-bin_SCRIPTS += gnome-shell-jhbuild
-else
-gnome_shell = gnome-shell-real
-endif
-EXTRA_DIST += gnome-shell-jhbuild.in
-
-noinst_DATA = gnome-shell
-gnome-shell: $(gnome_shell) Makefile
-       $(AM_V_GEN) cp $< $  tmp && mv $  tmp $@
-install-exec-hook:
-       mv $(DESTDIR)$(bindir)/$(gnome_shell) $(DESTDIR)$(bindir)/gnome-shell
-uninstall-hook:
-       rm -f $(DESTDIR)$(bindir)/gnome-shell
+bin_PROGRAMS = gnome-shell
 
 generated_script_substitutions = \
            -e "s|@bindir[ ]|$(bindir)|g" \
@@ -63,11 +47,6 @@ generated_script_substitutions = \
            -e "s|@sysconfdir[ ]|$(sysconfdir)|g" \
            -e "s|@GJS_CONSOLE[ ]|$(GJS_CONSOLE)|g"
 
-gnome-shell-jhbuild: gnome-shell-jhbuild.in gnome-shell-real Makefile
-       $(AM_V_GEN) sed $(generated_script_substitutions) $< > $  tmp && mv $  tmp $@ && chmod a+x $@
-       @# Regenerate libtool wrapper so Alt+F2 restart will work
-       @$(LIBTOOL) --mode=execute test -f gnome-shell-real
-
 gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $  tmp && mv $  tmp $@ && chmod a+x $@
 
@@ -185,11 +164,10 @@ libgnome_shell_la_SOURCES =               \
 libgnome_shell_la_gir_sources = \
        $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) 
$(libgnome_shell_la_SOURCES))
 
-gnome_shell_real_SOURCES =             \
-       main.c
-gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
-gnome_shell_real_DEPENDENCIES = libgnome-shell.la
+gnome_shell_SOURCES = main.c
+gnome_shell_CPPFLAGS = $(gnome_shell_cflags)
+gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
+gnome_shell_DEPENDENCIES = libgnome-shell.la
 
 ########################################