diff src/Makefile.am @ 11171:ebb02ea3c789

[gaim-migrate @ 13272] Moved DBUS init call from gtkmain.c to core.c Reimplemented DBUS bindings mechamism to use low-level GLib bindings as described in my last blog entry. This way plugins can add new DBUS methods on the fly. Also wrote an example plugin that demonstrate how to do it. committer: Tailor Script <[e-mail]>

--- a/src/Makefile.am	Fri Jul 29 13:38:00 2005 +0000
+++ b/src/Makefile.am	Sat Jul 30 00:23:21 2005 +0000
@@ -146,37 +146,25 @@
 
 if ENABLE_DBUS
 
-dbus_sources = dbus-server.c dbus-useful.c
+dbus_sources  = dbus-server.c dbus-useful.c
 dbus_headers  = dbus-server.h dbus-useful.h dbus-maybe.h 
-dbus_exported_headers = dbus-useful.h dbus-define-api.h account.h blist.h connection.h conversation.h core.h roomlist.h
-
-CLEANFILES=dbus-auto-enum-types.h dbus-auto-enums.txt dbus-auto-structs.txt dbus-generated-code.c dbus-generated-code.xml dbus-service-all.xml dbus-server-bindings.c
-
-dbus-auto-structs.txt: dbus-analyze-types.py $(gaim_coreheaders)
-	cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=struct --list > $@
-
-dbus-auto-enums.txt: dbus-analyze-types.py $(gaim_coreheaders)
-	cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=enum --list > $@
 
-dbus-auto-enum-types.h: dbus-analyze-types.py $(gaim_coreheaders)
-	cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=struct --enum > $@
-
-dbus-generated-code.c: dbus-analyze-functions.py dbus-auto-structs.txt dbus-auto-enums.txt $(dbus_exported_headers)
-	cat $(dbus_exported_headers) | $(PYTHON) dbus-analyze-functions.py --mode=c > $@
+CLEANFILES    = dbus-bindings.c
 
-dbus-generated-code.xml: dbus-analyze-functions.py dbus-auto-structs.txt dbus-auto-enums.txt $(dbus_exported_headers)
-	cat $(dbus_exported_headers) | $(PYTHON) dbus-analyze-functions.py --mode=xml > $@
-
-dbus-service-all.xml: dbus-service.xml dbus-generated-code.xml dbus-service-end.xml
-	cat $^ > $@
-
-dbus-server-bindings.c: dbus-service-all.xml $(DBUS_BINDING_TOOL)
-	$(DBUS_BINDING_TOOL) --prefix=gaim_object --mode=glib-server --output=$@ $<
+dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h connection.h conversation.h core.h roomlist.h
 
 
-$(gaim_OBJECTS): dbus-auto-enum-types.h
+dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
+	cat $(dbus_exported) | $(PYTHON) dbus-analyze-functions.py > $@
+
+dbus-server.$(OBJEXT): dbus-bindings.c 
 
-dbus-server.$(OBJEXT): dbus-server-bindings.c dbus-generated-code.c
+# dbus-types.c: dbus-analyze-types.py $(gaim_coreheaders)
+# 	cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=struct '--pattern=GAIM_DBUS_DEFINE_TYPE(%s)' > $@
+
+# dbus-types.h: dbus-analyze-types.py $(gaim_coreheaders)
+# 	cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=struct '--pattern=GAIM_DBUS_DECLARE_TYPE(%s)' > $@
+
 
 endif