[Pkg-utopia-commits] r660 - packages/unstable/dbus/debian/patches
Sjoerd Simons
sjoerd at costa.debian.org
Fri Feb 24 21:56:02 UTC 2006
Author: sjoerd
Date: 2006-02-24 21:55:55 +0000 (Fri, 24 Feb 2006)
New Revision: 660
Modified:
packages/unstable/dbus/debian/patches/dbus-update-automake.patch
Log:
Actually update the right file
Modified: packages/unstable/dbus/debian/patches/dbus-update-automake.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-update-automake.patch 2006-02-24 21:46:50 UTC (rev 659)
+++ packages/unstable/dbus/debian/patches/dbus-update-automake.patch 2006-02-24 21:55:55 UTC (rev 660)
@@ -1,16 +1,448 @@
-diff -ur dbus-0.61.orig/qt/Makefile.am dbus-0.61/qt/Makefile.am
---- dbus-0.61.orig/qt/Makefile.am 2006-02-24 22:33:32.000000000 +0100
-+++ dbus-0.61/qt/Makefile.am 2006-02-24 22:35:37.000000000 +0100
-@@ -58,9 +58,9 @@
- $(top_srcdir)/qt/qdbusxmlparser_p.h
+diff -ur dbus-0.61.orig/test/qt/Makefile.in dbus-0.61/test/qt/Makefile.in
+--- dbus-0.61.orig/test/qt/Makefile.in 2006-02-24 22:45:46.000000000 +0100
++++ dbus-0.61/test/qt/Makefile.in 2006-02-24 22:46:15.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 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.
+@@ -21,6 +21,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -34,73 +35,7 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+ host_triplet = @host@
+-target_triplet = @target@
+-noinst_PROGRAMS = $(am__EXEEXT_1)
+-subdir = test/qt
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+- $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+- at DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = qdbusconnection$(EXEEXT) \
+- at DBUS_BUILD_TESTS_TRUE@ qdbusobject$(EXEEXT) \
+- at DBUS_BUILD_TESTS_TRUE@ qdbusinterface$(EXEEXT) \
+- at DBUS_BUILD_TESTS_TRUE@ qdbustype$(EXEEXT) \
+- at DBUS_BUILD_TESTS_TRUE@ qdbusxmlparser$(EXEEXT) hal$(EXEEXT)
+-PROGRAMS = $(noinst_PROGRAMS)
+-am_hal_OBJECTS = tst_hal.$(OBJEXT)
+-hal_OBJECTS = $(am_hal_OBJECTS)
+-hal_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/qt/libdbus-qt4-1.la
+-hal_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_qdbusconnection_OBJECTS = tst_qdbusconnection.$(OBJEXT)
+-qdbusconnection_OBJECTS = $(am_qdbusconnection_OBJECTS)
+-qdbusconnection_LDADD = $(LDADD)
+-qdbusconnection_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_qdbusinterface_OBJECTS = tst_qdbusinterface.$(OBJEXT)
+-qdbusinterface_OBJECTS = $(am_qdbusinterface_OBJECTS)
+-qdbusinterface_LDADD = $(LDADD)
+-qdbusinterface_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_qdbusobject_OBJECTS = tst_qdbusobject.$(OBJEXT)
+-qdbusobject_OBJECTS = $(am_qdbusobject_OBJECTS)
+-qdbusobject_LDADD = $(LDADD)
+-qdbusobject_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_qdbustype_OBJECTS = tst_qdbustype.$(OBJEXT)
+-qdbustype_OBJECTS = $(am_qdbustype_OBJECTS)
+-qdbustype_LDADD = $(LDADD)
+-qdbustype_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_qdbusxmlparser_OBJECTS = tst_qdbusxmlparser.$(OBJEXT)
+-qdbusxmlparser_OBJECTS = $(am_qdbusxmlparser_OBJECTS)
+-qdbusxmlparser_LDADD = $(LDADD)
+-qdbusxmlparser_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(hal_SOURCES) $(qdbusconnection_SOURCES) \
+- $(qdbusinterface_SOURCES) $(qdbusobject_SOURCES) \
+- $(qdbustype_SOURCES) $(qdbusxmlparser_SOURCES)
+-DIST_SOURCES = $(hal_SOURCES) $(qdbusconnection_SOURCES) \
+- $(qdbusinterface_SOURCES) $(qdbusobject_SOURCES) \
+- $(qdbustype_SOURCES) $(qdbusxmlparser_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -356,51 +291,101 @@
+ target_vendor = @target_vendor@
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/qt $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) $(DBUS_QTESTLIB_CFLAGS) -DDBUS_COMPILATION
+ @DBUS_BUILD_TESTS_FALSE at TEST_BINARIES =
++
+ @DBUS_BUILD_TESTS_TRUE at TEST_BINARIES = qdbusconnection qdbusobject qdbusinterface qdbustype qdbusxmlparser hal
+ @DBUS_BUILD_TESTS_FALSE at TESTS =
+ @DBUS_BUILD_TESTS_TRUE at TESTS =
++
++noinst_PROGRAMS = $(TEST_BINARIES)
++
+ qdbusconnection_SOURCES = tst_qdbusconnection.cpp
+ qdbusobject_SOURCES = tst_qdbusobject.cpp
+ qdbusinterface_SOURCES = tst_qdbusinterface.cpp
+ qdbustype_SOURCES = tst_qdbustype.cpp
+ qdbusxmlparser_SOURCES = tst_qdbusxmlparser.cpp
+ hal_SOURCES = tst_hal.cpp
++
+ TEST_LIBS = $(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/libdbus-qt4-1.la
++
+ LDADD = $(TEST_LIBS)
++
+ CLEANFILES = tst_qdbusconnection.moc
++subdir = test/qt
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++ at DBUS_BUILD_TESTS_TRUE@noinst_PROGRAMS = qdbusconnection$(EXEEXT) \
++ at DBUS_BUILD_TESTS_TRUE@ qdbusobject$(EXEEXT) \
++ at DBUS_BUILD_TESTS_TRUE@ qdbusinterface$(EXEEXT) \
++ at DBUS_BUILD_TESTS_TRUE@ qdbustype$(EXEEXT) \
++ at DBUS_BUILD_TESTS_TRUE@ qdbusxmlparser$(EXEEXT) hal$(EXEEXT)
++ at DBUS_BUILD_TESTS_FALSE@noinst_PROGRAMS =
++PROGRAMS = $(noinst_PROGRAMS)
++
++am_hal_OBJECTS = tst_hal.$(OBJEXT)
++hal_OBJECTS = $(am_hal_OBJECTS)
++hal_LDADD = $(LDADD)
++hal_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++hal_LDFLAGS =
++am_qdbusconnection_OBJECTS = tst_qdbusconnection.$(OBJEXT)
++qdbusconnection_OBJECTS = $(am_qdbusconnection_OBJECTS)
++qdbusconnection_LDADD = $(LDADD)
++qdbusconnection_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++qdbusconnection_LDFLAGS =
++am_qdbusinterface_OBJECTS = tst_qdbusinterface.$(OBJEXT)
++qdbusinterface_OBJECTS = $(am_qdbusinterface_OBJECTS)
++qdbusinterface_LDADD = $(LDADD)
++qdbusinterface_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++qdbusinterface_LDFLAGS =
++am_qdbusobject_OBJECTS = tst_qdbusobject.$(OBJEXT)
++qdbusobject_OBJECTS = $(am_qdbusobject_OBJECTS)
++qdbusobject_LDADD = $(LDADD)
++qdbusobject_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++qdbusobject_LDFLAGS =
++am_qdbustype_OBJECTS = tst_qdbustype.$(OBJEXT)
++qdbustype_OBJECTS = $(am_qdbustype_OBJECTS)
++qdbustype_LDADD = $(LDADD)
++qdbustype_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++qdbustype_LDFLAGS =
++am_qdbusxmlparser_OBJECTS = tst_qdbusxmlparser.$(OBJEXT)
++qdbusxmlparser_OBJECTS = $(am_qdbusxmlparser_OBJECTS)
++qdbusxmlparser_LDADD = $(LDADD)
++qdbusxmlparser_DEPENDENCIES = $(top_builddir)/qt/libdbus-qt4-1.la
++qdbusxmlparser_LDFLAGS =
++
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tst_hal.Po \
++ at AMDEP_TRUE@ ./$(DEPDIR)/tst_qdbusconnection.Po \
++ at AMDEP_TRUE@ ./$(DEPDIR)/tst_qdbusinterface.Po \
++ at AMDEP_TRUE@ ./$(DEPDIR)/tst_qdbusobject.Po \
++ at AMDEP_TRUE@ ./$(DEPDIR)/tst_qdbustype.Po \
++ at AMDEP_TRUE@ ./$(DEPDIR)/tst_qdbusxmlparser.Po
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(hal_SOURCES) $(qdbusconnection_SOURCES) \
++ $(qdbusinterface_SOURCES) $(qdbusobject_SOURCES) \
++ $(qdbustype_SOURCES) $(qdbusxmlparser_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
++SOURCES = $(hal_SOURCES) $(qdbusconnection_SOURCES) $(qdbusinterface_SOURCES) $(qdbusobject_SOURCES) $(qdbustype_SOURCES) $(qdbusxmlparser_SOURCES)
++
+ all: all-am
--$(top_srcdir)/qt/qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
--$(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc
--$(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc
-+qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
-+qdbusserver.lo: qdbusserver.moc
-+qdbusconnection.lo: qdbusconnection_p.moc
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/qt/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu test/qt/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
+ clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+@@ -428,7 +413,7 @@
+ $(CXXLINK) $(qdbusxmlparser_LDFLAGS) $(qdbusxmlparser_OBJECTS) $(qdbusxmlparser_LDADD) $(LIBS)
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -441,25 +426,37 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tst_qdbusxmlparser.Po at am__quote@
+
+ .cpp.o:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++ at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++ at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++ at am__fastdepCXX_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++ at am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++ at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++ at am__fastdepCXX_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++ at am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
++ at am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++ at am__fastdepCXX_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -471,6 +468,14 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -479,7 +484,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -491,11 +495,10 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -532,24 +535,24 @@
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+- xpass=`expr $$xpass + 1`; \
+- failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
++ xpass=`expr $$xpass + 1`; \
++ failed=`expr $$failed + 1`; \
++ echo "XPASS: $$tst"; \
+ ;; \
+ *) \
+- echo "PASS: $$tst"; \
++ echo "PASS: $$tst"; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+- xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
++ xfail=`expr $$xfail + 1`; \
++ echo "XFAIL: $$tst"; \
+ ;; \
+ *) \
+- failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
++ failed=`expr $$failed + 1`; \
++ echo "FAIL: $$tst"; \
+ ;; \
+ esac; \
+ else \
+@@ -574,23 +577,27 @@
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ skipped="($$skip tests were not run)"; \
+- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
++ test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
++ test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+- test -z "$$skipped" || echo "$$skipped"; \
+- test -z "$$report" || echo "$$report"; \
++ test -n "$$skipped" && echo "$$skipped"; \
++ test -n "$$report" && echo "$$report"; \
+ echo "$$dashes"; \
+ test "$$failed" -eq 0; \
+ else :; fi
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -604,7 +611,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -623,6 +630,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -644,7 +652,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -664,8 +672,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -702,15 +708,14 @@
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS ctags \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man 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-info-am
++ distclean distclean-compile distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ 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-info-am
+
+
+ tst_qdbusconnection.o: tst_qdbusconnection.moc
More information about the Pkg-utopia-commits
mailing list