diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/maemo | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/maemo')
47 files changed, 34942 insertions, 0 deletions
diff --git a/packages/maemo/.mtn2git_empty b/packages/maemo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/.mtn2git_empty diff --git a/packages/maemo/gconf-osso/.mtn2git_empty b/packages/maemo/gconf-osso/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/gconf-osso/.mtn2git_empty diff --git a/packages/maemo/gconf-osso/free-entry-fix.diff b/packages/maemo/gconf-osso/free-entry-fix.diff index e69de29bb2..43e45a7be1 100644 --- a/packages/maemo/gconf-osso/free-entry-fix.diff +++ b/packages/maemo/gconf-osso/free-entry-fix.diff @@ -0,0 +1,11 @@ +diff -ur GConf-2.6.4/gconf/gconf-client.c GConf-2.6.4.new/gconf/gconf-client.c +--- GConf-2.6.4/gconf/gconf-client.c 2004-09-19 15:29:35.000000000 +0300 ++++ GConf-2.6.4.new/gconf/gconf-client.c 2005-04-08 10:59:46.268506800 +0300 +@@ -776,7 +776,6 @@ + static gboolean + clear_cache_foreach (char* key, GConfEntry* entry, GConfClient* client) + { +- g_free (key); + gconf_entry_free (entry); + + return TRUE; diff --git a/packages/maemo/gconf-osso/gconf-daemon-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-oe.sh index e69de29bb2..a14954de6e 100644 --- a/packages/maemo/gconf-osso/gconf-daemon-oe.sh +++ b/packages/maemo/gconf-osso/gconf-daemon-oe.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# GConf daemon startup/shutdown script + +PROG=/usr/libexec/gconfd-2 +SVC="GConf daemon" + +case "$1" in +start) START=TRUE + ;; +stop) START=FALSE + ;; +*) echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +if [ $START = TRUE ]; then + $LAUNCHWRAPPER start "$SVC" $PROG +else + $LAUNCHWRAPPER stop"$SVC" $PROG +fi diff --git a/packages/maemo/gconf-osso/gconf-update.patch b/packages/maemo/gconf-osso/gconf-update.patch index e69de29bb2..9870078b86 100644 --- a/packages/maemo/gconf-osso/gconf-update.patch +++ b/packages/maemo/gconf-osso/gconf-update.patch @@ -0,0 +1,31 @@ +? gconf/gconf.service +Index: gconf/Makefile.am +=================================================================== +RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v +retrieving revision 1.78.4.8 +diff -u -r1.78.4.8 Makefile.am +--- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8 ++++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000 +@@ -155,6 +155,7 @@ + + libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined + libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS) ++libgconf_2_la_CFLAGS = $(AM_CFLAGS) + + if HAVE_DBUS + servicedir = $(DBUS_SERVICE_DIR) +Index: backends/Makefile.am +=================================================================== +RCS file: /cvs/gnome/gconf/backends/Makefile.am,v +retrieving revision 1.30 +diff -u -r1.30 Makefile.am +--- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30 ++++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000 +@@ -17,6 +17,7 @@ + + libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined + libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ++libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS) + + libgconfbackend_xml_la_SOURCES = \ + markup-backend.c \ diff --git a/packages/maemo/gconf-osso/no-po-no-examples.diff b/packages/maemo/gconf-osso/no-po-no-examples.diff index e69de29bb2..afc3860104 100644 --- a/packages/maemo/gconf-osso/no-po-no-examples.diff +++ b/packages/maemo/gconf-osso/no-po-no-examples.diff @@ -0,0 +1,34032 @@ +diff -urN GConf-2.6.4/Makefile.am GConf-2.6.4.new/Makefile.am +--- GConf-2.6.4/Makefile.am 2004-09-20 00:42:59.000000000 +0300 ++++ GConf-2.6.4.new/Makefile.am 2005-03-05 11:06:46.000000000 +0200 +@@ -1,5 +1,5 @@ + +-SUBDIRS = gconf backends po doc examples ++SUBDIRS = gconf backends doc + DIST_SUBDIRS=tests $(SUBDIRS) + + DBUS_GCONF_CONF=gconfd.conf +diff -urN GConf-2.6.4/Makefile.in GConf-2.6.4.new/Makefile.in +--- GConf-2.6.4/Makefile.in 2004-09-20 00:45:15.000000000 +0300 ++++ GConf-2.6.4.new/Makefile.in 2005-03-05 11:07:05.000000000 +0200 +@@ -1,6 +1,8 @@ +-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ++# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# @configure_input@ + +-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # 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. +@@ -10,69 +12,57 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +- +-SHELL = @SHELL@ ++@SET_MAKE@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +- +-bindir = @bindir@ +-sbindir = @sbindir@ +-libexecdir = @libexecdir@ +-datadir = @datadir@ +-sysconfdir = @sysconfdir@ +-sharedstatedir = @sharedstatedir@ +-localstatedir = @localstatedir@ +-libdir = @libdir@ +-infodir = @infodir@ +-mandir = @mandir@ +-includedir = @includedir@ +-oldincludedir = /usr/include +- +-DESTDIR = +- + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +- + top_builddir = . + +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ +- ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-transform = @program_transform_name@ +- ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-host_alias = @host_alias@ + host_triplet = @host@ ++ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ ++CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ + DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ + DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ + DEPENDENT_LIBS = @DEPENDENT_LIBS@ + DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ +@@ -83,48 +73,73 @@ + DEPENDENT_WITH_XML_LIBS = @DEPENDENT_WITH_XML_LIBS@ + DLLTOOL = @DLLTOOL@ + ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + EXEEXT = @EXEEXT@ + EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ + F77 = @F77@ +-GCJ = @GCJ@ +-GCJFLAGS = @GCJFLAGS@ ++FFLAGS = @FFLAGS@ + GCONF_AGE = @GCONF_AGE@ + GCONF_CONFIG_SOURCE = @GCONF_CONFIG_SOURCE@ + GCONF_CURRENT = @GCONF_CURRENT@ ++GCONF_DBUS_CFLAGS = @GCONF_DBUS_CFLAGS@ ++GCONF_DBUS_LIBS = @GCONF_DBUS_LIBS@ + GCONF_IPC_CFLAGS = @GCONF_IPC_CFLAGS@ + GCONF_IPC_LIBS = @GCONF_IPC_LIBS@ ++GCONF_ORBIT_CFLAGS = @GCONF_ORBIT_CFLAGS@ ++GCONF_ORBIT_LIBS = @GCONF_ORBIT_LIBS@ + GCONF_REVISION = @GCONF_REVISION@ +-GENCAT = @GENCAT@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GTKDOC = @GTKDOC@ +-GT_NO = @GT_NO@ +-GT_YES = @GT_YES@ ++GTK_FALSE = @GTK_FALSE@ ++GTK_TRUE = @GTK_TRUE@ ++HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@ ++HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@ ++HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ ++HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_GTK_DOC = @HAVE_GTK_DOC@ +-HAVE_LIB = @HAVE_LIB@ ++HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ ++HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ ++HAVE_ORBIT_FALSE = @HAVE_ORBIT_FALSE@ ++HAVE_ORBIT_TRUE = @HAVE_ORBIT_TRUE@ + HTML_DIR = @HTML_DIR@ +-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ + INDENT = @INDENT@ ++INSTALL_DATA = @INSTALL_DATA@ + INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ +-INTLDEPS = @INTLDEPS@ + INTLLIBS = @INTLLIBS@ +-INTLOBJS = @INTLOBJS@ + LDFLAGS = @LDFLAGS@ +-LIB = @LIB@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ +-LTLIB = @LTLIB@ ++LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAJOR_VERSION = @MAJOR_VERSION@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + ORBIT_IDL = @ORBIT_IDL@ + PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ + PC_REQUIRES = @PC_REQUIRES@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -133,18 +148,65 @@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++PTHREADS_FALSE = @PTHREADS_FALSE@ ++PTHREADS_TRUE = @PTHREADS_TRUE@ + RANLIB = @RANLIB@ +-RC = @RC@ + REBUILD = @REBUILD@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ + STRIP = @STRIP@ +-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ + USE_NLS = @USE_NLS@ ++USE_SYSTEM_BUS_FALSE = @USE_SYSTEM_BUS_FALSE@ ++USE_SYSTEM_BUS_TRUE = @USE_SYSTEM_BUS_TRUE@ + VERSION = @VERSION@ ++XGETTEXT = @XGETTEXT@ + absolute_top_srcdir = @absolute_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ ++ac_ct_AS = @ac_ct_AS@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ++ac_ct_F77 = @ac_ct_F77@ ++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ ++ac_ct_RANLIB = @ac_ct_RANLIB@ ++ac_ct_STRIP = @ac_ct_STRIP@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ + gconflocaledir = @gconflocaledir@ +-l = @l@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ + +-SUBDIRS = gconf backends po doc examples ++SUBDIRS = gconf backends doc + DIST_SUBDIRS = tests $(SUBDIRS) + + DBUS_GCONF_CONF = gconfd.conf +@@ -152,112 +214,119 @@ + @USE_SYSTEM_BUS_TRUE@dbusconfdir = $(sysconfdir)/dbus-1/system.d + @USE_SYSTEM_BUS_TRUE@dbusconf_DATA = $(DBUS_GCONF_CONF) + +-EXTRA_DIST = gconf.m4.in TODO gconf-2.0.pc.in $(DBUS_GCONF_CONF) ++EXTRA_DIST = gconf.m4.in TODO \ ++ gconf-2.0.pc.in \ ++ $(DBUS_GCONF_CONF) + + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gconf-2.0.pc ++subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = gconf.m4 gconf-2.0.pc +-DATA = $(dbusconf_DATA) $(pkgconfig_DATA) +- +-DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ +-INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ +-aclocal.m4 config.guess config.h.in config.sub configure configure.in \ +-gconf-2.0.pc.in gconf.m4.in install-sh ltmain.sh missing mkinstalldirs +- +- +-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++CONFIG_CLEAN_FILES = gconf.m4 gconf-2.0.pc ++DIST_SOURCES = ++DATA = $(dbusconf_DATA) $(pkgconfig_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ ++ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \ ++ TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \ ++ config.h.in config.sub configure configure.in depcomp \ ++ gconf-2.0.pc.in gconf.m4.in install-sh ltmain.sh missing \ ++ mkinstalldirs ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive + +-TAR = tar +-GZIP_ENV = --best +-all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 +- cd $(srcdir) && $(ACLOCAL) +- +-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +-config.h: stamp-h +- @if test ! -f $@; then \ +- rm -f stamp-h; \ +- $(MAKE) stamp-h; \ +- else :; fi +-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES= CONFIG_HEADERS=config.h \ +- $(SHELL) ./config.status +- @echo timestamp > stamp-h 2> /dev/null +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ ++config.h: stamp-h1 + @if test ! -f $@; then \ +- rm -f $(srcdir)/stamp-h.in; \ +- $(MAKE) $(srcdir)/stamp-h.in; \ ++ rm -f stamp-h1; \ ++ $(MAKE) stamp-h1; \ + else :; fi +-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +- cd $(top_srcdir) && $(AUTOHEADER) +- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +-mostlyclean-hdr: ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h + +-clean-hdr: ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h ++ cd $(top_srcdir) && $(AUTOHEADER) ++ touch $(srcdir)/config.h.in + + distclean-hdr: +- -rm -f config.h +- +-maintainer-clean-hdr: ++ -rm -f config.h stamp-h1 + gconf.m4: $(top_builddir)/config.status gconf.m4.in +- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ + gconf-2.0.pc: $(top_builddir)/config.status gconf-2.0.pc.in +- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++ ++mostlyclean-libtool: ++ -rm -f *.lo + ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++dbusconfDATA_INSTALL = $(INSTALL_DATA) + install-dbusconfDATA: $(dbusconf_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(dbusconfdir) + @list='$(dbusconf_DATA)'; for p in $$list; do \ +- if test -f $(srcdir)/$$p; then \ +- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(dbusconfdir)/$$p"; \ +- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(dbusconfdir)/$$p; \ +- else if test -f $$p; then \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(dbusconfdir)/$$p"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(dbusconfdir)/$$p; \ +- fi; fi; \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(dbusconfDATA_INSTALL) $$d$$p $(DESTDIR)$(dbusconfdir)/$$f"; \ ++ $(dbusconfDATA_INSTALL) $$d$$p $(DESTDIR)$(dbusconfdir)/$$f; \ + done + + uninstall-dbusconfDATA: + @$(NORMAL_UNINSTALL) +- list='$(dbusconf_DATA)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(dbusconfdir)/$$p; \ ++ @list='$(dbusconf_DATA)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(dbusconfdir)/$$f"; \ ++ rm -f $(DESTDIR)$(dbusconfdir)/$$f; \ + done +- ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- if test -f $(srcdir)/$$p; then \ +- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ +- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ +- else if test -f $$p; then \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ +- fi; fi; \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) +- list='$(pkgconfig_DATA)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -266,13 +335,8 @@ + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. +- +-@SET_MAKE@ +- +-all-recursive install-data-recursive install-exec-recursive \ +-installdirs-recursive install-recursive uninstall-recursive \ +-check-recursive installcheck-recursive info-recursive dvi-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++$(RECURSIVE_TARGETS): ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -292,13 +356,18 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ +- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ +- rev="$$subdir $$rev"; \ +- test "$$subdir" != "." || dot_seen=yes; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ + done; \ +- test "$$dot_seen" = "no" && rev=". $$rev"; \ ++ rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ +@@ -314,177 +383,303 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = + + tags: TAGS + +-ID: $(HEADERS) $(SOURCES) $(LISP) +- list='$(SOURCES) $(HEADERS)'; \ +- unique=`for i in $$list; do echo $$i; done | \ +- awk ' { files[$$0] = 1; } \ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $$unique $(LISP) ++ mkid -fID $$unique + +-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ else \ ++ include_option=--include; \ ++ fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ +- fi; \ ++ if test "$$subdir" = .; then :; else \ ++ test -f $$subdir/TAGS && \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ + done; \ +- list='$(SOURCES) $(HEADERS)'; \ +- unique=`for i in $$list; do echo $$i; done | \ +- awk ' { files[$$0] = 1; } \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ |