From e5631cfe85f125c572f598a414c0659d6ce72684 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@codefactory.se>
Date: Wed, 5 Feb 2003 23:56:39 +0000
Subject: [PATCH] 2003-02-06  Anders Carlsson  <andersca@codefactory.se>

	* dbus/Makefile.am:
	* dbus/dbus-break-loader.c:
	* test/Makefile.am:
	* test/break-loader.c:
	Move dbus-break-loader to test/ and rename it to break-loader.
---
 ChangeLog                                       |  8 ++++++++
 dbus/Makefile.am                                |  2 +-
 test/Makefile.am                                |  6 +++++-
 dbus/dbus-break-loader.c => test/break-loader.c | 13 ++++++++-----
 4 files changed, 22 insertions(+), 7 deletions(-)
 rename dbus/dbus-break-loader.c => test/break-loader.c (98%)

diff --git a/ChangeLog b/ChangeLog
index 0c01740..13d283f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-06  Anders Carlsson  <andersca@codefactory.se>
+
+	* dbus/Makefile.am:
+	* dbus/dbus-break-loader.c:
+	* test/Makefile.am:
+	* test/break-loader.c:
+	Move dbus-break-loader to test/ and rename it to break-loader.
+
 2003-02-02  Havoc Pennington  <hp@pobox.com>
 
 	* dbus/dbus-keyring.c, dbus/dbus-keyring.h: template files 
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index c28b538..f6f84a6 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -96,7 +96,7 @@ libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
 ## TESTS
 if DBUS_BUILD_TESTS
 TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_srcdir)/test/data
-TESTS=dbus-test dbus-break-loader
+TESTS=dbus-test 
 else
 TESTS=
 endif
diff --git a/test/Makefile.am b/test/Makefile.am
index fc218b7..972d67c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS) 
 
 if DBUS_BUILD_TESTS
-TEST_BINARIES=echo-client echo-server unbase64 bus-test
+TEST_BINARIES=echo-client echo-server unbase64 bus-test break-loader
 else
 TEST_BINARIES=
 endif
@@ -26,11 +26,15 @@ unbase64_SOURCES=				\
 bus_test_SOURCES = 				\
 	bus-test.c
 
+break_loader_SOURCES=				\
+	break-loader.c
+
 TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la $(top_builddir)/dbus/libdbus-1.la
 
 echo_client_LDADD=$(TEST_LIBS)
 echo_server_LDADD=$(TEST_LIBS)
 unbase64_LDADD=$(TEST_LIBS)
+break_loader_LDADD= $(TEST_LIBS)
 bus_test_LDADD=$(TEST_LIBS) $(top_builddir)/bus/libdbus-daemon.la
 
 dist-hook:
diff --git a/dbus/dbus-break-loader.c b/test/break-loader.c
similarity index 98%
rename from dbus/dbus-break-loader.c
rename to test/break-loader.c
index c27299c..95ca808 100644
--- a/dbus/dbus-break-loader.c
+++ b/test/break-loader.c
@@ -21,11 +21,7 @@
  *
  */
 
-#include "dbus-types.h"
-#include "dbus-test.h"
-#include "dbus-internals.h"
-#include "dbus-sysdeps.h"
-#include "dbus-marshal.h"
+#include <dbus/dbus.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -36,6 +32,13 @@
 #include <sys/wait.h>
 #include <string.h>
 
+#define DBUS_COMPILATION 
+#include <dbus/dbus-string.h>
+#include <dbus/dbus-internals.h>
+#include <dbus/dbus-test.h>
+#include <dbus/dbus-marshal.h>
+#undef DBUS_COMPILATION
+
 static DBusString failure_dir;
 static int total_attempts;
 static int failures_this_iteration;
-- 
2.7.4