dbus/dbus Makefile.am,1.72,1.73 qdbus.h,NONE,1.1

[Harald Fernengel]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv19117/dbus

Modified Files:
	Makefile.am 
Added Files:
	qdbus.h 
Log Message:
adding an autotest and "dbus-ify" the build process and include scheme


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/dbus/Makefile.am,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Makefile.am	6 Sep 2005 22:38:54 -0000	1.72
+++ Makefile.am	23 Sep 2005 16:24:36 -0000	1.73
@@ -15,6 +15,10 @@
 
 endif
 
+if HAVE_QT
+QT_INCLUDES=qdbus.h
+endif
+
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
 
@@ -35,7 +39,8 @@
 	dbus-shared.h				\
 	dbus-threads.h				\
 	dbus-types.h				\
-	$(GLIB_INCLUDES)
+	$(GLIB_INCLUDES)			\
+	$(QT_INCLUDES)
 
 dbusarchinclude_HEADERS=			\
 	dbus-arch-deps.h

--- NEW FILE: qdbus.h ---
/* qdbus.h precompiled header
 *
 * Copyright (C) 2005 Harald Fernengel <harry at 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>

#ifndef DBUS_COMPILATION
# define QDBUS_EXPORT Q_DECL_IMPORT
# include <dbus/qdbusconnection.h>
# include <dbus/qdbuserror.h>
# include <dbus/qdbusmessage.h>
# include <dbus/qdbusserver.h>
#else
# define QDBUS_EXPORT Q_DECL_EXPORT
# include <qt/qdbusconnection.h>
# include <qt/qdbuserror.h>
# include <qt/qdbusmessage.h>
# include <qt/qdbusserver.h>
#endif

#endif