2003-06-23 Anders Carlsson <andersca@codefactory.se>

	* configure.in:
	* gcj/.cvsignore:
	* gcj/Hello.java:
	* gcj/Makefile.am:
	* gcj/TestMessage.java: (TestMessage), (TestMessage.main):
	* gcj/org/.cvsignore:
	* gcj/org/Makefile.am:
	* gcj/org/freedesktop/.cvsignore:
	* gcj/org/freedesktop/Makefile.am:
	* gcj/org/freedesktop/dbus/.cvsignore:
	* gcj/org/freedesktop/dbus/Makefile.am:
	* gcj/org/freedesktop/dbus/Message.java: (Message),
	(Message.Message):
	* gcj/org/freedesktop/dbus/natMessage.cc:
	Fix the build system.

8 files changed, 104 insertions, 0 deletions

diff --git a/gcj/org/.cvsignore b/gcj/org/.cvsignore
new file mode 100644
index 00000000..22a4e729
--- /dev/null
+++ b/gcj/org/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
diff --git a/gcj/org/Makefile.am b/gcj/org/Makefile.am
new file mode 100644
index 00000000..a3e21224
--- /dev/null
+++ b/gcj/org/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=freedesktop
diff --git a/gcj/org/freedesktop/.cvsignore b/gcj/org/freedesktop/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/gcj/org/freedesktop/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gcj/org/freedesktop/Makefile.am b/gcj/org/freedesktop/Makefile.am
new file mode 100644
index 00000000..ee8f397a
--- /dev/null
+++ b/gcj/org/freedesktop/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=dbus
diff --git a/gcj/org/freedesktop/dbus/.cvsignore b/gcj/org/freedesktop/dbus/.cvsignore
new file mode 100644
index 00000000..1744d8cb
--- /dev/null
+++ b/gcj/org/freedesktop/dbus/.cvsignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.class
+*.lo
+*.h
+
diff --git a/gcj/org/freedesktop/dbus/Makefile.am b/gcj/org/freedesktop/dbus/Makefile.am
new file mode 100644
index 00000000..8d676284
--- /dev/null
+++ b/gcj/org/freedesktop/dbus/Makefile.am
@@ -0,0 +1,55 @@
+INCLUDES=						\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir)/gcj/org/freedesktop/dbus	\
+	 $(DBUS_CLIENT_CFLAGS) 
+
+
+GCJH = gcjh
+
+lib_LTLIBRARIES = libdbus-gcj-1.la
+
+MOSTLYCLEANFILES = $(generated_headers) $(java_class_files)
+
+
+java_sources = 				\
+	Message.java
+
+native_sources = 			\
+	natMessage.cc
+
+generated_headers = $(java_sources:.java=.h)
+java_class_files = $(java_sources:.java=.class)
+native_object_files = $(native_sources:.cc=.lo)
+java_object_files = $(java_sources:.java=.lo)
+
+.class.h:
+	$(GCJH) $(basename $<)
+
+.java.class:
+	$(GCJ) -C $< -d ../../..
+
+.cc.lo:
+	$(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) -c -o '$@' '$<'
+
+.java.lo:
+	$(LIBTOOL) --mode=compile $(GCJ) $(GCJ_FLAGS) -c -o '$@' '$<'
+
+libdbus_gcj_1_la_SOURCES =
+
+libdbus_gcj_1_la_DEPENDENCIES = 	\
+	$(generated_headers)		\
+	$(native_object_files)		\
+	$(java_object_files)		\
+	$(java_class_files)
+
+
+libdbus_gcj_1_la_LIBADD = 		\
+	$(native_object_files)		\
+	$(java_object_files)
+
+EXTRA_libdbus_gcj_1_la_SOURCES = 	\
+	$(native_sources)		\
+	$(java_sources)
+
+libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+
diff --git a/gcj/org/freedesktop/dbus/Message.java b/gcj/org/freedesktop/dbus/Message.java
new file mode 100644
index 00000000..ede8b3aa
--- /dev/null
+++ b/gcj/org/freedesktop/dbus/Message.java
@@ -0,0 +1,13 @@
+package org.freedesktop.dbus;
+
+import gnu.gcj.RawData;
+
+public class Message {
+    private RawData message;
+
+    public Message (String name, String destService) {
+	this.message = dbus_message_new (name, destService);
+    }
+
+    private static native RawData dbus_message_new (String name, String destService);
+}
diff --git a/gcj/org/freedesktop/dbus/natMessage.cc b/gcj/org/freedesktop/dbus/natMessage.cc
new file mode 100644
index 00000000..d8b19033
--- /dev/null
+++ b/gcj/org/freedesktop/dbus/natMessage.cc
@@ -0,0 +1,20 @@
+// This file was created by `gcjh -stubs'. -*- c++ -*-
+//
+// This file is intended to give you a head start on implementing native
+// methods using CNI.
+// Be aware: running `gcjh -stubs ' once more for this class may
+// overwrite any edits you have made to this file.
+
+#include <Message.h>
+#include <gcj/cni.h>
+#include <java/lang/UnsupportedOperationException.h>
+
+#include <dbus/dbus.h>
+
+::gnu::gcj::RawData *
+org::freedesktop::dbus::Message::dbus_message_new (::java::lang::String *, ::java::lang::String *)
+{
+  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("org::freedesktop::dbus::Message::dbus_message_new (::java::lang::String *, ::java::lang::String *) not implemented"));
+}
+
+