r15924 - in /packages/experimental/devhelp/debian: changelog patches/02_gecko_1.9.patch patches/70_autoconf.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon May 12 19:31:50 UTC 2008
Author: joss
Date: Mon May 12 19:31:49 2008
New Revision: 15924
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15924
Log:
* 02_gecko_1.9.patch:
+ Patch from Christian Kirbach to get devhelp to build against
libxul-embedding.
+ Modified to strip the -R flags from Makefile.am.
+ Augmented with the xpcomglue patch from Ubuntu.
+ Also include the prefs patch from Ubuntu to display colors
correctly.
+ Modified to remove the libcppwrapper hack, which doesn't work
anymore because the dependency on libstdc++ is missing.
Modified:
packages/experimental/devhelp/debian/changelog
packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch
packages/experimental/devhelp/debian/patches/70_autoconf.patch
packages/experimental/devhelp/debian/rules
Modified: packages/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/changelog?rev=15924&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/changelog (original)
+++ packages/experimental/devhelp/debian/changelog Mon May 12 19:31:49 2008
@@ -4,12 +4,19 @@
* Switch to quilt for patch handling; build-depend on quilt.
* Build-depend on xulrunner-dev and make libdevhelp depend on
xulrunner-1.9.
- * 02_gecko_1.9.patch: patch from Christian Kirbach to get devhelp to
- build against libxul-embedding.
+ * 02_gecko_1.9.patch:
+ + Patch from Christian Kirbach to get devhelp to build against
+ libxul-embedding.
+ + Modified to strip the -R flags from Makefile.am.
+ + Augmented with the xpcomglue patch from Ubuntu.
+ + Also include the prefs patch from Ubuntu to display colors
+ correctly.
+ + Modified to remove the libcppwrapper hack, which doesn't work
+ anymore because the dependency on libstdc++ is missing.
* Pass --with-gecko=libxul-embedding to use it. Closes: #480792.
* 70_autoconf.patch: run the autotools on top of that.
- -- Josselin Mouette <joss at debian.org> Mon, 12 May 2008 19:20:24 +0200
+ -- Josselin Mouette <joss at debian.org> Mon, 12 May 2008 19:46:42 +0200
devhelp (0.19-1) unstable; urgency=low
Modified: packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch?rev=15924&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch (original)
+++ packages/experimental/devhelp/debian/patches/02_gecko_1.9.patch Mon May 12 19:31:49 2008
@@ -1,7 +1,7 @@
-Index: m4/gecko.m4
+Index: devhelp-0.19/m4/gecko.m4
===================================================================
---- a/m4/gecko.m4 (Revision 999)
-+++ b/m4/gecko.m4 (Arbeitskopie)
+--- devhelp-0.19.orig/m4/gecko.m4 2008-05-12 19:13:42.760935965 +0200
++++ devhelp-0.19/m4/gecko.m4 2008-05-12 19:13:52.504936081 +0200
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License along
@@ -19,7 +19,7 @@
# VARIABLE_PREFIX:
# VARIABLE_INCLUDE_ROOT:
# VARIABLE_VERSION: The version of the gecko that was found
-@@ -51,7 +52,7 @@
+@@ -51,7 +52,7 @@ AC_PROG_AWK
AC_MSG_CHECKING([which gecko to use])
AC_ARG_WITH([gecko],
@@ -28,7 +28,7 @@
[Which gecko engine to use (autodetected by default)]))
# Backward compat
-@@ -60,12 +61,15 @@
+@@ -60,12 +61,15 @@ AC_ARG_WITH([mozilla],[],[with_gecko=$wi
gecko_cv_gecko=$with_gecko
# Autodetect gecko
@@ -45,7 +45,7 @@
fi
done
fi
-@@ -82,6 +86,14 @@
+@@ -82,6 +86,14 @@ else
gecko_cv_have_gecko=yes
fi
@@ -60,7 +60,7 @@
# ****************
# Define variables
# ****************
-@@ -93,27 +105,38 @@
+@@ -93,27 +105,38 @@ mozilla) gecko_cv_gecko_flavour=mozilla
seamonkey) gecko_cv_gecko_flavour=mozilla ;;
*firefox) gecko_cv_gecko_flavour=toolkit ;;
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
@@ -106,7 +106,7 @@
# **************************************************************
# This is really gcc-only
-@@ -184,7 +207,7 @@
+@@ -184,7 +207,7 @@ if test "$gecko_cv_have_gecko" = "yes";
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -115,7 +115,7 @@
AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
AC_RUN_IFELSE(
-@@ -217,6 +240,18 @@
+@@ -217,6 +240,18 @@ AC_COMPILE_IFELSE(
[gecko_cv_have_debug=no])
AC_MSG_RESULT([$gecko_cv_have_debug])
@@ -134,22 +134,21 @@
CPPFLAGS="$_SAVE_CPPFLAGS"
AC_LANG_POP([C++])
-@@ -228,10 +263,12 @@
+@@ -228,9 +263,11 @@ if test "$gecko_cv_have_debug" = "yes";
AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
fi
+-fi # if gecko_cv_have_gecko
+if test "$gecko_cv_have_xpcom_glue" = "yes"; then
+ AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
+fi
-+
- fi # if gecko_cv_have_gecko
-AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
--
++fi # if gecko_cv_have_gecko
+
# ***********************
# Check for gecko version
- # ***********************
-@@ -241,7 +278,7 @@
+@@ -241,7 +278,7 @@ if test "$gecko_cv_have_gecko" = "yes";
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -158,7 +157,7 @@
AC_CACHE_CHECK([for gecko version],
[gecko_cv_gecko_version],
-@@ -311,11 +348,6 @@
+@@ -311,11 +348,6 @@ fi
fi # if gecko_cv_have_gecko
@@ -170,7 +169,7 @@
$1[]_VERSION=$gecko_cv_gecko_version
$1[]_VERSION_INT=$gecko_cv_gecko_version_int
-@@ -328,8 +360,11 @@
+@@ -328,8 +360,11 @@ gecko_cv_glue_libs=
gecko_cv_extra_pkg_dependencies=
if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
@@ -184,7 +183,7 @@
else
gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
fi
-@@ -340,6 +375,29 @@
+@@ -340,6 +375,29 @@ $1[]_GLUE_LIBS="$gecko_cv_glue_libs"
])
@@ -214,7 +213,7 @@
# ***************************************************************************
# ***************************************************************************
# ***************************************************************************
-@@ -359,10 +417,20 @@
+@@ -359,10 +417,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -239,7 +238,7 @@
_GECKO_DISPATCH_INCLUDEDIRS="$2"
-@@ -371,9 +439,11 @@
+@@ -371,9 +439,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="$2"
# Mind you, it's useful to be able to test against uninstalled mozilla builds...
_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
@@ -253,7 +252,7 @@
done
m4_indir([$1],m4_shiftn(2,$@))
-@@ -426,11 +496,17 @@
+@@ -426,11 +496,17 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
#include <mozilla-config.h>
#include <stdlib.h>
#include <stdio.h>
@@ -272,7 +271,7 @@
#include <nsStringAPI.h>
#else
#include <nsString.h>
-@@ -438,16 +514,37 @@
+@@ -438,16 +514,37 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
]]
[$1],
[[
@@ -312,7 +311,7 @@
rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
if (NS_FAILED (rv)) {
-@@ -595,21 +692,22 @@
+@@ -595,21 +692,22 @@ fi
AC_DEFUN([GECKO_XPIDL],
[AC_REQUIRE([GECKO_INIT])dnl
@@ -342,11 +341,11 @@
if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
fi
-Index: configure.in
+Index: devhelp-0.19/configure.in
===================================================================
---- a/configure.in (Revision 999)
-+++ b/configure.in (Arbeitskopie)
-@@ -19,6 +19,8 @@
+--- devhelp-0.19.orig/configure.in 2008-05-12 19:13:42.736936994 +0200
++++ devhelp-0.19/configure.in 2008-05-12 20:16:12.220428557 +0200
+@@ -19,6 +19,8 @@ AM_PROG_LIBTOOL
AM_PATH_GLIB_2_0
@@ -355,7 +354,7 @@
IT_PROG_INTLTOOL([0.35.5])
AC_PATH_PROG(GCONFTOOL, gconftool-2)
-@@ -66,6 +68,7 @@
+@@ -66,6 +68,7 @@ PKG_CHECK_MODULES(LIBDEVHELP, [
# *****
GECKO_INIT([GECKO])
@@ -363,7 +362,7 @@
AC_SUBST([GECKO])
AC_SUBST([GECKO_FLAVOUR])
-@@ -73,6 +76,7 @@
+@@ -73,6 +76,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT])
AC_SUBST([GECKO_HOME])
AC_SUBST([GECKO_PREFIX])
AC_SUBST([GECKO_EXTRA_LIBS])
@@ -371,7 +370,7 @@
case "$GECKO" in
mozilla) gecko_min_version=1.7 ;;
-@@ -80,9 +84,16 @@
+@@ -80,9 +84,16 @@ seamonkey) gecko_min_version=1.0 ;;
*firefox) gecko_min_version=1.0 ;;
*thunderbird) gecko_min_version=1.0 ;;
xulrunner) gecko_min_version=1.8 ;;
@@ -389,3 +388,213 @@
AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])
+Index: devhelp-0.19/src/Makefile.am
+===================================================================
+--- devhelp-0.19.orig/src/Makefile.am 2008-05-12 19:32:30.248429737 +0200
++++ devhelp-0.19/src/Makefile.am 2008-05-12 21:23:23.404937427 +0200
+@@ -25,17 +25,11 @@ devhelp_LDADD = \
+ $(DEVHELP_LIBS) \
+ libdevhelp-1.la
+
+-devhelp_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
++devhelp_LDFLAGS = $(AM_LDFLAGS)
+
+-# Build the C++ code in a separate library so we can use our warning
+-# flags for the C code.
+-noinst_LTLIBRARIES = libcppwrapper.la
+-
+-libcppwrapper_la_SOURCES = \
+- Yelper.cpp \
+- Yelper.h \
+- dh-gecko-utils.cpp \
+- dh-gecko-utils.h
++if !HAVE_GECKO_XPCOM_GLUE
++devhelp_LDFLAGS += -R$(GECKO_HOME)
++endif
+
+ gecko_include_subdirs = \
+ . \
+@@ -53,23 +47,6 @@ gecko_include_subdirs = \
+ string \
+ xpcom
+
+-libcppwrapper_la_CPPFLAGS = \
+- $(DEFINES) \
+- -DALLOW_PRIVATE_API \
+- -DGECKO_HOME=\""$(GECKO_HOME)\"" \
+- -include $(GECKO_INCLUDE_ROOT)/mozilla-config.h \
+- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
+- $(LIBDEVHELP_CFLAGS) \
+- $(AM_CPPFLAGS)
+-
+-libcppwrapper_la_CXXFLAGS = \
+- $(GECKO_CFLAGS) \
+- $(AM_CXXFLAGS)
+-
+-libcppwrapper_la_LIBADD = \
+- $(GECKO_LIBS) \
+- $(GECKO_EXTRA_LIBS)
+-
+ lib_LTLIBRARIES = libdevhelp-1.la
+
+ devhelpincludedir = $(includedir)/devhelp-1.0/devhelp
+@@ -88,6 +65,10 @@ devhelpinclude_HEADERS = \
+ eggfindbar.h
+
+ libdevhelp_1_la_SOURCES = \
++ Yelper.cpp \
++ Yelper.h \
++ dh-gecko-utils.cpp \
++ dh-gecko-utils.h \
+ bacon-message-connection.c \
+ bacon-message-connection.h \
+ dh-marshal-main.c \
+@@ -106,6 +87,8 @@ libdevhelp_1_la_SOURCES = \
+
+ libdevhelp_1_la_CPPFLAGS = \
+ $(DEFINES) \
++ -DALLOW_PRIVATE_API \
++ -DGECKO_HOME=\""$(GECKO_HOME)\"" \
+ $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
+ $(AM_CPPFLAGS)
+
+@@ -115,13 +98,21 @@ libdevhelp_1_la_CFLAGS = \
+ $(GECKO_CFLAGS) \
+ $(AM_CFLAGS)
+
++libdevhelp_1_la_CXXFLAGS = \
++ $(LIBDEVHELP_CFLAGS) \
++ $(GECKO_CFLAGS) \
++ $(AM_CXXFLAGS)
++
+ libdevhelp_1_la_LIBADD = \
+- libcppwrapper.la \
+ $(LIBDEVHELP_LIBS) \
+ $(GECKO_LIBS) \
+ $(GECKO_EXTRA_LIBS)
+
+-libdevhelp_1_la_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
++libdevhelp_1_la_LDFLAGS = $(AM_LDFLAGS)
++
++if !HAVE_GECKO_XPCOM_GLUE
++libdevhelp_1_la_LDFLAGS += -R$(GECKO_HOME)
++endif
+
+ dh-marshal.h: dh-marshal.list
+ (cd $(srcdir) && \
+Index: devhelp-0.19/src/dh-gecko-utils.cpp
+===================================================================
+--- devhelp-0.19.orig/src/dh-gecko-utils.cpp 2008-05-12 20:36:48.776432926 +0200
++++ devhelp-0.19/src/dh-gecko-utils.cpp 2008-05-12 20:36:52.944931316 +0200
+@@ -21,6 +21,9 @@
+ */
+
+ #include <config.h>
++#ifdef XPCOM_GLUE
++# include <gtkmozembed_glue.cpp>
++#endif
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
+
+@@ -41,7 +44,7 @@
+
+ #include <stdlib.h>
+
+-#ifndef HAVE_GECKO_1_8
++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
+ #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
+ #include <chrome/nsIChromeRegistrySea.h>
+ #elif defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN)
+@@ -226,7 +229,7 @@ dh_gecko_utils_set_font (gint type, cons
+ g_free (name);
+ }
+
+-#ifndef HAVE_GECKO_1_8
++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
+
+ static nsresult
+ getUILang (nsAString& aUILang)
+@@ -286,7 +289,7 @@ gecko_utils_init_chrome (void)
+ #endif
+ }
+
+-#endif /* !HAVE_GECKO_1_8 */
++#endif /* !HAVE_GECKO_1_8 && !HAVE_GECKO_1_9 */
+
+ static nsresult
+ gecko_utils_init_prefs (void)
+@@ -318,11 +321,57 @@ dh_gecko_utils_init (void)
+ NS_LogInit ();
+ #endif
+
++nsresult rv;
++#ifdef XPCOM_GLUE
++ static const GREVersionRange greVersion = {
++ "1.9a", PR_TRUE,
++ "1.9.*", PR_TRUE
++ };
++ char xpcomLocation[4096];
++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not determine locale!\n");
++ return;
++ }
++
++ // Startup the XPCOM Glue that links us up with XPCOM.
++ rv = XPCOMGlueStartup(xpcomLocation);
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not determine locale!\n");
++ return;
++ }
++
++ rv = GTKEmbedGlueStartup();
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not startup embed glue!\n");
++ return;
++ }
++
++ #ifdef GTKEmbedGlueStartupInternal
++ rv = GTKEmbedGlueStartupInternal();
++ if (NS_FAILED (rv))
++ {
++ g_warning ("Could not startup embed glue (internal)!\n");
++ return;
++ }
++ #endif
++
++ char *lastSlash = strrchr(xpcomLocation, '/');
++ if (lastSlash)
++ *lastSlash = '\0';
++
++ gtk_moz_embed_set_path(xpcomLocation);
++
++#else
+ #ifdef HAVE_GECKO_1_9
+ gtk_moz_embed_set_path (GECKO_HOME);
+ #else
+ gtk_moz_embed_set_comp_path (GECKO_HOME);
+ #endif
++#endif // XPCOM_GLUE
+
+ gchar *profile_dir = g_build_filename (g_get_home_dir (),
+ ".gnome2",
+@@ -336,7 +385,7 @@ dh_gecko_utils_init (void)
+
+ gecko_utils_init_prefs ();
+
+-#ifndef HAVE_GECKO_1_8
++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
+ gecko_utils_init_chrome ();
+ #endif
+ }
+Index: devhelp-0.19/src/default-prefs-gecko-1-9.js
+===================================================================
+--- devhelp-0.19.orig/src/default-prefs-gecko-1-9.js 2008-05-12 21:30:08.904428349 +0200
++++ devhelp-0.19/src/default-prefs-gecko-1-9.js 2008-05-12 21:30:16.452433177 +0200
+@@ -1,2 +1,2 @@
+-pref("browser.display.use_document_colors", false);
++pref("browser.display.use_document_colors", true);
+
Modified: packages/experimental/devhelp/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/70_autoconf.patch?rev=15924&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/70_autoconf.patch (original)
+++ packages/experimental/devhelp/debian/patches/70_autoconf.patch Mon May 12 19:31:49 2008
@@ -4,8 +4,8 @@
Index: devhelp-0.19/Makefile.in
===================================================================
---- devhelp-0.19.orig/Makefile.in 2008-05-12 19:15:45.604436728 +0200
-+++ devhelp-0.19/Makefile.in 2008-05-12 19:15:56.504929472 +0200
+--- devhelp-0.19.orig/Makefile.in 2008-05-12 21:23:32.272437306 +0200
++++ devhelp-0.19/Makefile.in 2008-05-12 21:23:53.368930826 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -112,8 +112,8 @@
install-data install-data-am install-dvi install-dvi-am \
Index: devhelp-0.19/aclocal.m4
===================================================================
---- devhelp-0.19.orig/aclocal.m4 2008-05-12 19:15:20.448934313 +0200
-+++ devhelp-0.19/aclocal.m4 2008-05-12 19:15:33.804927656 +0200
+--- devhelp-0.19.orig/aclocal.m4 2008-05-12 21:23:32.248438824 +0200
++++ devhelp-0.19/aclocal.m4 2008-05-12 21:23:38.612935434 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -809,8 +809,8 @@
Index: devhelp-0.19/configure
===================================================================
---- devhelp-0.19.orig/configure 2008-05-12 19:14:49.576438137 +0200
-+++ devhelp-0.19/configure 2008-05-12 19:16:04.704427199 +0200
+--- devhelp-0.19.orig/configure 2008-05-12 21:23:32.224438386 +0200
++++ devhelp-0.19/configure 2008-05-12 21:23:54.324927960 +0200
@@ -869,6 +869,8 @@ LN_S
ECHO
AR
@@ -3148,8 +3148,8 @@
X"$mf" : 'X\(//\)[^/]' \| \
Index: devhelp-0.19/contrib/Makefile.in
===================================================================
---- devhelp-0.19.orig/contrib/Makefile.in 2008-05-12 19:15:46.040429273 +0200
-+++ devhelp-0.19/contrib/Makefile.in 2008-05-12 19:15:55.572928865 +0200
+--- devhelp-0.19.orig/contrib/Makefile.in 2008-05-12 21:23:32.204438266 +0200
++++ devhelp-0.19/contrib/Makefile.in 2008-05-12 21:23:52.260929456 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3187,8 +3187,8 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Index: devhelp-0.19/data/Makefile.in
===================================================================
---- devhelp-0.19.orig/data/Makefile.in 2008-05-12 19:15:45.816429591 +0200
-+++ devhelp-0.19/data/Makefile.in 2008-05-12 19:15:55.684930907 +0200
+--- devhelp-0.19.orig/data/Makefile.in 2008-05-12 21:23:32.176438000 +0200
++++ devhelp-0.19/data/Makefile.in 2008-05-12 21:23:52.376928881 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3264,8 +3264,8 @@
$$tags $$unique
Index: devhelp-0.19/data/dtd/Makefile.in
===================================================================
---- devhelp-0.19.orig/data/dtd/Makefile.in 2008-05-12 19:15:45.756433142 +0200
-+++ devhelp-0.19/data/dtd/Makefile.in 2008-05-12 19:15:55.764928942 +0200
+--- devhelp-0.19.orig/data/dtd/Makefile.in 2008-05-12 21:23:32.148430401 +0200
++++ devhelp-0.19/data/dtd/Makefile.in 2008-05-12 21:23:52.472932098 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3303,8 +3303,8 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Index: devhelp-0.19/data/icons/Makefile.in
===================================================================
---- devhelp-0.19.orig/data/icons/Makefile.in 2008-05-12 19:15:45.972433656 +0200
-+++ devhelp-0.19/data/icons/Makefile.in 2008-05-12 19:15:55.852929567 +0200
+--- devhelp-0.19.orig/data/icons/Makefile.in 2008-05-12 21:23:32.120434535 +0200
++++ devhelp-0.19/data/icons/Makefile.in 2008-05-12 21:23:52.588929567 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3342,8 +3342,8 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Index: devhelp-0.19/data/ui/Makefile.in
===================================================================
---- devhelp-0.19.orig/data/ui/Makefile.in 2008-05-12 19:15:45.876432885 +0200
-+++ devhelp-0.19/data/ui/Makefile.in 2008-05-12 19:15:55.936928898 +0200
+--- devhelp-0.19.orig/data/ui/Makefile.in 2008-05-12 21:23:32.092436714 +0200
++++ devhelp-0.19/data/ui/Makefile.in 2008-05-12 21:23:52.688930168 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3381,8 +3381,8 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Index: devhelp-0.19/misc/Makefile.in
===================================================================
---- devhelp-0.19.orig/misc/Makefile.in 2008-05-12 19:15:45.512436762 +0200
-+++ devhelp-0.19/misc/Makefile.in 2008-05-12 19:15:56.012930528 +0200
+--- devhelp-0.19.orig/misc/Makefile.in 2008-05-12 21:23:32.064449160 +0200
++++ devhelp-0.19/misc/Makefile.in 2008-05-12 21:23:52.784929472 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3458,8 +3458,8 @@
$$tags $$unique
Index: devhelp-0.19/misc/gedit-plugin/Makefile.in
===================================================================
---- devhelp-0.19.orig/misc/gedit-plugin/Makefile.in 2008-05-12 19:15:45.424432714 +0200
-+++ devhelp-0.19/misc/gedit-plugin/Makefile.in 2008-05-12 19:15:56.092929052 +0200
+--- devhelp-0.19.orig/misc/gedit-plugin/Makefile.in 2008-05-12 21:23:32.040439433 +0200
++++ devhelp-0.19/misc/gedit-plugin/Makefile.in 2008-05-12 21:23:52.888929900 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3535,8 +3535,8 @@
$$tags $$unique
Index: devhelp-0.19/misc/gedit-plugin/devhelp/Makefile.in
===================================================================
---- devhelp-0.19.orig/misc/gedit-plugin/devhelp/Makefile.in 2008-05-12 19:15:45.308435244 +0200
-+++ devhelp-0.19/misc/gedit-plugin/devhelp/Makefile.in 2008-05-12 19:15:56.172930022 +0200
+--- devhelp-0.19.orig/misc/gedit-plugin/devhelp/Makefile.in 2008-05-12 21:23:32.016438996 +0200
++++ devhelp-0.19/misc/gedit-plugin/devhelp/Makefile.in 2008-05-12 21:23:52.988930501 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3574,8 +3574,8 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Index: devhelp-0.19/src/Makefile.in
===================================================================
---- devhelp-0.19.orig/src/Makefile.in 2008-05-12 19:15:45.664430243 +0200
-+++ devhelp-0.19/src/Makefile.in 2008-05-12 19:15:56.396929215 +0200
+--- devhelp-0.19.orig/src/Makefile.in 2008-05-12 21:23:31.976438267 +0200
++++ devhelp-0.19/src/Makefile.in 2008-05-12 21:23:53.244932233 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3587,7 +3587,59 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,7 +94,7 @@ devhelp_DEPENDENCIES = $(am__DEPENDENCIE
+@@ -36,8 +36,10 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ bin_PROGRAMS = devhelp$(EXEEXT)
+- at HAVE_GECKO_1_8_TRUE@am__append_1 = default-prefs-gecko-1-8.js
+- at HAVE_GECKO_1_9_TRUE@am__append_2 = default-prefs-gecko-1-9.js
++ at HAVE_GECKO_XPCOM_GLUE_FALSE@am__append_1 = -R$(GECKO_HOME)
++ at HAVE_GECKO_XPCOM_GLUE_FALSE@am__append_2 = -R$(GECKO_HOME)
++ at HAVE_GECKO_1_8_TRUE@am__append_3 = default-prefs-gecko-1-8.js
++ at HAVE_GECKO_1_9_TRUE@am__append_4 = default-prefs-gecko-1-9.js
+ subdir = src
+ DIST_COMMON = $(devhelpinclude_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+@@ -60,20 +62,12 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+ "$(DESTDIR)$(default_prefsdir)" \
+ "$(DESTDIR)$(devhelpincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libcppwrapper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-am_libcppwrapper_la_OBJECTS = libcppwrapper_la-Yelper.lo \
+- libcppwrapper_la-dh-gecko-utils.lo
+-libcppwrapper_la_OBJECTS = $(am_libcppwrapper_la_OBJECTS)
+-libcppwrapper_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+- $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
+-libdevhelp_1_la_DEPENDENCIES = libcppwrapper.la $(am__DEPENDENCIES_1) \
++libdevhelp_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_libdevhelp_1_la_OBJECTS = \
++am_libdevhelp_1_la_OBJECTS = libdevhelp_1_la-Yelper.lo \
++ libdevhelp_1_la-dh-gecko-utils.lo \
+ libdevhelp_1_la-bacon-message-connection.lo \
+ libdevhelp_1_la-dh-marshal-main.lo libdevhelp_1_la-dh-base.lo \
+ libdevhelp_1_la-dh-book-tree.lo libdevhelp_1_la-dh-error.lo \
+@@ -83,9 +77,10 @@ am_libdevhelp_1_la_OBJECTS = \
+ libdevhelp_1_la-dh-util.lo libdevhelp_1_la-dh-window.lo \
+ libdevhelp_1_la-eggfindbar.lo
+ libdevhelp_1_la_OBJECTS = $(am_libdevhelp_1_la_OBJECTS)
+-libdevhelp_1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libdevhelp_1_la_CFLAGS) \
+- $(CFLAGS) $(libdevhelp_1_la_LDFLAGS) $(LDFLAGS) -o $@
++libdevhelp_1_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++ $(libdevhelp_1_la_CXXFLAGS) $(CXXFLAGS) \
++ $(libdevhelp_1_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_devhelp_OBJECTS = devhelp-dh-main.$(OBJEXT)
+@@ -94,7 +89,7 @@ devhelp_DEPENDENCIES = $(am__DEPENDENCIE
devhelp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(devhelp_CFLAGS) $(CFLAGS) \
$(devhelp_LDFLAGS) $(LDFLAGS) -o $@
@@ -3596,7 +3648,20 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -151,6 +151,7 @@ DEFS = @DEFS@
+@@ -115,10 +110,8 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+-SOURCES = $(libcppwrapper_la_SOURCES) $(libdevhelp_1_la_SOURCES) \
+- $(devhelp_SOURCES)
+-DIST_SOURCES = $(libcppwrapper_la_SOURCES) $(libdevhelp_1_la_SOURCES) \
+- $(devhelp_SOURCES)
++SOURCES = $(libdevhelp_1_la_SOURCES) $(devhelp_SOURCES)
++DIST_SOURCES = $(libdevhelp_1_la_SOURCES) $(devhelp_SOURCES)
+ default_prefsDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(default_prefs_DATA)
+ devhelpincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -151,6 +144,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEVHELP_CFLAGS = @DEVHELP_CFLAGS@
DEVHELP_LIBS = @DEVHELP_LIBS@
@@ -3604,7 +3669,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -166,6 +167,7 @@ GECKO = @GECKO@
+@@ -166,6 +160,7 @@ GECKO = @GECKO@
GECKO_CFLAGS = @GECKO_CFLAGS@
GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
GECKO_FLAVOUR = @GECKO_FLAVOUR@
@@ -3612,7 +3677,7 @@
GECKO_HOME = @GECKO_HOME@
GECKO_INCLUDE_ROOT = @GECKO_INCLUDE_ROOT@
GECKO_LIBS = @GECKO_LIBS@
-@@ -224,6 +226,7 @@ MKDIR_P = @MKDIR_P@
+@@ -224,6 +219,7 @@ MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -3620,7 +3685,101 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -493,8 +496,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
+@@ -336,17 +332,7 @@ devhelp_LDADD = \
+ $(DEVHELP_LIBS) \
+ libdevhelp-1.la
+
+-devhelp_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
+-
+-# Build the C++ code in a separate library so we can use our warning
+-# flags for the C code.
+-noinst_LTLIBRARIES = libcppwrapper.la
+-libcppwrapper_la_SOURCES = \
+- Yelper.cpp \
+- Yelper.h \
+- dh-gecko-utils.cpp \
+- dh-gecko-utils.h
+-
++devhelp_LDFLAGS = $(AM_LDFLAGS) $(am__append_1)
+ gecko_include_subdirs = \
+ . \
+ commandhandler \
+@@ -363,23 +349,6 @@ gecko_include_subdirs = \
+ string \
+ xpcom
+
+-libcppwrapper_la_CPPFLAGS = \
+- $(DEFINES) \
+- -DALLOW_PRIVATE_API \
+- -DGECKO_HOME=\""$(GECKO_HOME)\"" \
+- -include $(GECKO_INCLUDE_ROOT)/mozilla-config.h \
+- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
+- $(LIBDEVHELP_CFLAGS) \
+- $(AM_CPPFLAGS)
+-
+-libcppwrapper_la_CXXFLAGS = \
+- $(GECKO_CFLAGS) \
+- $(AM_CXXFLAGS)
+-
+-libcppwrapper_la_LIBADD = \
+- $(GECKO_LIBS) \
+- $(GECKO_EXTRA_LIBS)
+-
+ lib_LTLIBRARIES = libdevhelp-1.la
+ devhelpincludedir = $(includedir)/devhelp-1.0/devhelp
+ devhelpinclude_HEADERS = \
+@@ -397,6 +366,10 @@ devhelpinclude_HEADERS = \
+ eggfindbar.h
+
+ libdevhelp_1_la_SOURCES = \
++ Yelper.cpp \
++ Yelper.h \
++ dh-gecko-utils.cpp \
++ dh-gecko-utils.h \
+ bacon-message-connection.c \
+ bacon-message-connection.h \
+ dh-marshal-main.c \
+@@ -415,6 +388,8 @@ libdevhelp_1_la_SOURCES = \
+
+ libdevhelp_1_la_CPPFLAGS = \
+ $(DEFINES) \
++ -DALLOW_PRIVATE_API \
++ -DGECKO_HOME=\""$(GECKO_HOME)\"" \
+ $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
+ $(AM_CPPFLAGS)
+
+@@ -424,13 +399,17 @@ libdevhelp_1_la_CFLAGS = \
+ $(GECKO_CFLAGS) \
+ $(AM_CFLAGS)
+
++libdevhelp_1_la_CXXFLAGS = \
++ $(LIBDEVHELP_CFLAGS) \
++ $(GECKO_CFLAGS) \
++ $(AM_CXXFLAGS)
++
+ libdevhelp_1_la_LIBADD = \
+- libcppwrapper.la \
+ $(LIBDEVHELP_LIBS) \
+ $(GECKO_LIBS) \
+ $(GECKO_EXTRA_LIBS)
+
+-libdevhelp_1_la_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
++libdevhelp_1_la_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
+ default_prefs_in_FILES = \
+ default-prefs-common.js \
+ default-prefs-mozilla.js \
+@@ -439,8 +418,8 @@ default_prefs_in_FILES = \
+ default-prefs-gecko-1-9.js
+
+ default_prefs_files = default-prefs-common.js \
+- default-prefs-$(GECKO_FLAVOUR).js $(am__append_1) \
+- $(am__append_2)
++ default-prefs-$(GECKO_FLAVOUR).js $(am__append_3) \
++ $(am__append_4)
+ default_prefsdir = $(pkgdatadir)
+ default_prefs_DATA = default-prefs.js
+ BUILT_SOURCES = \
+@@ -493,8 +472,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -3631,7 +3790,7 @@
else :; fi; \
done
-@@ -502,8 +505,8 @@ uninstall-libLTLIBRARIES:
+@@ -502,8 +481,8 @@ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -3642,7 +3801,25 @@
done
clean-libLTLIBRARIES:
-@@ -536,8 +539,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -514,17 +493,6 @@ clean-libLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-
+-clean-noinstLTLIBRARIES:
+- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
+- echo "rm -f \"$${dir}/so_locations\""; \
+- rm -f "$${dir}/so_locations"; \
+- done
+-libcppwrapper.la: $(libcppwrapper_la_OBJECTS) $(libcppwrapper_la_DEPENDENCIES)
+- $(libcppwrapper_la_LINK) $(libcppwrapper_la_OBJECTS) $(libcppwrapper_la_LIBADD) $(LIBS)
+ libdevhelp-1.la: $(libdevhelp_1_la_OBJECTS) $(libdevhelp_1_la_DEPENDENCIES)
+ $(libdevhelp_1_la_LINK) -rpath $(libdir) $(libdevhelp_1_la_OBJECTS) $(libdevhelp_1_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -536,8 +504,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -3653,7 +3830,52 @@
else :; fi; \
done
-@@ -796,8 +799,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -566,12 +534,12 @@ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/devhelp-dh-main.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcppwrapper_la-Yelper.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libcppwrapper_la-dh-gecko-utils.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-Yelper.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-bacon-message-connection.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-base.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-book-tree.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-error.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-gecko-utils.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-html.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-keyword-model.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libdevhelp_1_la-dh-link.Plo at am__quote@
+@@ -737,19 +705,19 @@ devhelp-dh-main.obj: dh-main.c
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+-libcppwrapper_la-Yelper.lo: Yelper.cpp
+- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcppwrapper_la_CPPFLAGS) $(CPPFLAGS) $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) -MT libcppwrapper_la-Yelper.lo -MD -MP -MF $(DEPDIR)/libcppwrapper_la-Yelper.Tpo -c -o libcppwrapper_la-Yelper.lo `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libcppwrapper_la-Yelper.Tpo $(DEPDIR)/libcppwrapper_la-Yelper.Plo
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Yelper.cpp' object='libcppwrapper_la-Yelper.lo' libtool=yes @AMDEPBACKSLASH@
++libdevhelp_1_la-Yelper.lo: Yelper.cpp
++ at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_1_la_CXXFLAGS) $(CXXFLAGS) -MT libdevhelp_1_la-Yelper.lo -MD -MP -MF $(DEPDIR)/libdevhelp_1_la-Yelper.Tpo -c -o libdevhelp_1_la-Yelper.lo `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libdevhelp_1_la-Yelper.Tpo $(DEPDIR)/libdevhelp_1_la-Yelper.Plo
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Yelper.cpp' object='libdevhelp_1_la-Yelper.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcppwrapper_la_CPPFLAGS) $(CPPFLAGS) $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) -c -o libcppwrapper_la-Yelper.lo `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_1_la_CXXFLAGS) $(CXXFLAGS) -c -o libdevhelp_1_la-Yelper.lo `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
+
+-libcppwrapper_la-dh-gecko-utils.lo: dh-gecko-utils.cpp
+- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcppwrapper_la_CPPFLAGS) $(CPPFLAGS) $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) -MT libcppwrapper_la-dh-gecko-utils.lo -MD -MP -MF $(DEPDIR)/libcppwrapper_la-dh-gecko-utils.Tpo -c -o libcppwrapper_la-dh-gecko-utils.lo `test -f 'dh-gecko-utils.cpp' || echo '$(srcdir)/'`dh-gecko-utils.cpp
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libcppwrapper_la-dh-gecko-utils.Tpo $(DEPDIR)/libcppwrapper_la-dh-gecko-utils.Plo
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dh-gecko-utils.cpp' object='libcppwrapper_la-dh-gecko-utils.lo' libtool=yes @AMDEPBACKSLASH@
++libdevhelp_1_la-dh-gecko-utils.lo: dh-gecko-utils.cpp
++ at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_1_la_CXXFLAGS) $(CXXFLAGS) -MT libdevhelp_1_la-dh-gecko-utils.lo -MD -MP -MF $(DEPDIR)/libdevhelp_1_la-dh-gecko-utils.Tpo -c -o libdevhelp_1_la-dh-gecko-utils.lo `test -f 'dh-gecko-utils.cpp' || echo '$(srcdir)/'`dh-gecko-utils.cpp
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libdevhelp_1_la-dh-gecko-utils.Tpo $(DEPDIR)/libdevhelp_1_la-dh-gecko-utils.Plo
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dh-gecko-utils.cpp' object='libdevhelp_1_la-dh-gecko-utils.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcppwrapper_la_CPPFLAGS) $(CPPFLAGS) $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) -c -o libcppwrapper_la-dh-gecko-utils.lo `test -f 'dh-gecko-utils.cpp' || echo '$(srcdir)/'`dh-gecko-utils.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_1_la_CXXFLAGS) $(CXXFLAGS) -c -o libdevhelp_1_la-dh-gecko-utils.lo `test -f 'dh-gecko-utils.cpp' || echo '$(srcdir)/'`dh-gecko-utils.cpp
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -796,8 +764,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3664,7 +3886,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -809,8 +812,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+@@ -809,8 +777,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3675,7 +3897,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -820,13 +823,12 @@ ctags: CTAGS
+@@ -820,13 +788,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -3691,3 +3913,50 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
+@@ -905,7 +872,7 @@ maintainer-clean-generic:
+ clean: clean-am
+
+ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+- clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
++ clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+@@ -966,22 +933,21 @@ uninstall-am: uninstall-binPROGRAMS unin
+ .MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+- clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+- distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-binPROGRAMS install-data install-data-am \
+- install-default_prefsDATA install-devhelpincludeHEADERS \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-binPROGRAMS \
+- uninstall-default_prefsDATA uninstall-devhelpincludeHEADERS \
+- uninstall-libLTLIBRARIES
++ clean-generic clean-libLTLIBRARIES clean-libtool ctags \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-binPROGRAMS \
++ install-data install-data-am install-default_prefsDATA \
++ install-devhelpincludeHEADERS install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-libLTLIBRARIES \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-binPROGRAMS uninstall-default_prefsDATA \
++ uninstall-devhelpincludeHEADERS uninstall-libLTLIBRARIES
+
+
+ dh-marshal.h: dh-marshal.list
Modified: packages/experimental/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/rules?rev=15924&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/rules (original)
+++ packages/experimental/devhelp/debian/rules Mon May 12 19:31:49 2008
@@ -9,7 +9,8 @@
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-install-schemas --with-gecko=libxul-embedding
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-install-schemas \
+ --with-gecko=libxul-embedding
DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libdevhelp-1-0 (>= 0.14)'
More information about the pkg-gnome-commits
mailing list