From: Thiago Macieira <thiago@kde.org>
Date: Sun, 4 Jun 2006 16:02:16 +0000 (+0000)
Subject: 	* dbus/Makefile.am:
X-Git-Tag: dbus-0.62~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54b762aa4c692596f70892f7fb3d7e495bd8268a;p=platform%2Fupstream%2Fdbus.git

	* dbus/Makefile.am:
	* dbus/qdbus.h: Remove unnecessary file. This is mirrored into
        qt/dbus/qdbus.h now.
---

diff --git a/ChangeLog b/ChangeLog
index 294835b..12b6fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-06-04  Thiago Macieira <thiago.macieira@trolltech.com>
 
+	* dbus/Makefile.am:
+	* dbus/qdbus.h: Remove unnecessary file. This is mirrored into
+        qt/dbus/qdbus.h now.
+
+2006-06-04  Thiago Macieira <thiago.macieira@trolltech.com>
+
 	* configure.in: Make --disable-qt actually do
           something. Patch inspired by Zack Rusin.
 
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 88c50b0..060827b 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -15,10 +15,6 @@ dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh
 
 endif
 
-if HAVE_QT
-QT_INCLUDES=qdbus.h
-endif
-
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
 
@@ -40,8 +36,8 @@ dbusinclude_HEADERS=				\
 	dbus-signature.h			\
 	dbus-threads.h				\
 	dbus-types.h				\
-	$(GLIB_INCLUDES)			\
-	$(QT_INCLUDES)
+	$(GLIB_INCLUDES)
+
 
 dbusarchinclude_HEADERS=			\
 	dbus-arch-deps.h
diff --git a/dbus/qdbus.h b/dbus/qdbus.h
deleted file mode 100644
index 60f2f1e..0000000
--- a/dbus/qdbus.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* qdbus.h precompiled header
- *
- * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org>
- *
- * Licensed under the Academic Free License version 2.1
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef QDBUS_H
-#define QDBUS_H
-
-#include <QtCore/qglobal.h>
-
-#if !defined(DBUS_COMPILATION)
-# include <dbus/qdbusabstractadaptor.h>
-# include <dbus/qdbusabstractinterface.h>
-# include <dbus/qdbusbus.h>
-# include <dbus/qdbusconnection.h>
-# include <dbus/qdbuserror.h>
-# include <dbus/qdbusinterface.h>
-# include <dbus/qdbusmessage.h>
-# include <dbus/qdbusreply.h>
-# include <dbus/qdbusserver.h>
-# include <dbus/qdbusutil.h>
-#else
-# include <qt/qdbusabstractadaptor.h>
-# include <qt/qdbusabstractinterface.h>
-# include <qt/qdbusbus.h>
-# include <qt/qdbusconnection.h>
-# include <qt/qdbuserror.h>
-# include <qt/qdbusinterface.h>
-# include <qt/qdbusmessage.h>
-# include <qt/qdbusreply.h>
-# include <qt/qdbusserver.h>
-# include <qt/qdbusutil.h>
-#endif
-
-#endif