summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am16
-rw-r--r--data/gabble.manager29
2 files changed, 11 insertions, 34 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 8d61e2e9b..e942a4440 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,16 +3,22 @@ managerdir = $(datadir)/telepathy/managers
manager_DATA = gabble.manager
# Dbus service file
-BUILT_FILES = $(service_in_files:.service.in=.service)
-
servicedir = $(DBUS_SERVICES_DIR)
service_in_files = org.freedesktop.Telepathy.ConnectionManager.gabble.service.in
-service_DATA = $(BUILT_FILES)
+service_DATA = $(service_in_files:.service.in=.service)
+
+BUILT_FILES = $(service_DATA) $(manager_DATA)
+
CLEANFILES = $(BUILT_FILES)
-EXTRA_DIST = $(service_in_files) \
- gabble.manager
+EXTRA_DIST = $(service_in_files)
# Rule to make the service file with bindir expanded
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+$(manager_DATA): always-build
+ $(MAKE) -C ../src write-mgr-file
+ ../src/write-mgr-file > $@
+
+.PHONY: always-build
diff --git a/data/gabble.manager b/data/gabble.manager
deleted file mode 100644
index 2f83f356d..000000000
--- a/data/gabble.manager
+++ /dev/null
@@ -1,29 +0,0 @@
-[ConnectionManager]
-Name=gabble
-BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
-ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
-[Protocol jabber]
-param-account=s required register
-param-password=s required register
-param-server=s
-param-resource=s
-param-priority=n
-param-port=q
-param-old-ssl=b
-param-register=b
-param-low-bandwidth=b
-param-https-proxy-server=s
-param-https-proxy-port=q
-param-fallback-conference-server=s
-param-stun-server=s
-param-stun-port=q
-param-ignore-ssl-errors=b
-default-resource=Telepathy
-default-priority=0
-default-port=5222
-default-old-ssl=false
-default-register=false
-default-low-bandwidth=false
-default-https-proxy-port=443
-default-stun-port=3478
-default-ignore-ssl-errors=false