Remove an unnecessary directory in the data hierachy

12 files changed, 60 insertions, 61 deletions

diff --git a/.gitignore b/.gitignore
index e8c483a..2c4cb95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,11 +29,12 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 
-data/phoenix/*.service
-data/phoenix/uninstalled
+data/*.service
+data/uninstalled
 
 src/phoenix-authenticator
 src/phoenix-echo-call
 src/phoenix
-src/phoenix-test
+src/phoenix-uninstalled
+src/phoenix-test-uninstalled
 *.o
diff --git a/configure.ac b/configure.ac
index 1cafe81..466337b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,5 +63,4 @@ AC_OUTPUT( Makefile \
           m4/Makefile \
           src/Makefile \
           data/Makefile \
-          data/phoenix/Makefile \
 )
diff --git a/data/Makefile.am b/data/Makefile.am
index e4df88a..1a948a6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1,56 @@
-SUBDIRS=phoenix
+U_DBUS=uninstalled/dbus-1/services
+
+EXTRA_DIST = \
+  dbus-services/Phoenix.Approver.service.in \
+  dbus-services/Phoenix.Authenticator.service.in \
+  dbus-services/Phoenix.EchoCall.service.in \
+  dbus-services/Phoenix.EchoText.service.in \
+  telepathy-clients/Phoenix.Approver.client \
+  telepathy-clients/Phoenix.Authenticator.client \
+  telepathy-clients/Phoenix.EchoCall.client \
+  telepathy-clients/Phoenix.EchoText.client
+
+service_files = \
+  org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
+  org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
+  org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
+  org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
+
+uninstalled_service_files = \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
+  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
+
+client_files = \
+  telepathy-clients/Phoenix.EchoCall.client \
+  telepathy-clients/Phoenix.EchoText.client \
+  telepathy-clients/Phoenix.Approver.client \
+  telepathy-clients/Phoenix.Authenticator.client
+
+uninstalled_client_files = \
+  uninstalled/telepathy/clients/Phoenix.EchoCall.client \
+  uninstalled/telepathy/clients/Phoenix.EchoText.client \
+  uninstalled/telepathy/clients/Phoenix.Approver.client \
+  uninstalled/telepathy/clients/Phoenix.Authenticator.client
+
+$(U_DBUS)/org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
+	$(MKDIR_P) $(U_DBUS)
+	$(AM_V_GEN)sed -e "s|[@]PATH[@]|@abs_top_builddir@/src|g" $< > $@
+
+uninstalled/telepathy/clients/%.client: telepathy-clients/%.client
+	$(MKDIR_P) uninstalled/telepathy/clients
+	cp $< $@
+
+org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
+	$(AM_V_GEN)sed -e "s|[@]PATH[@]|$(libexecdir)|g" $< > $@
+
+
+xdgdatadir = $(pkgdatadir)/data
+dbusservicesdir = $(xdgdatadir)/dbus-1/services
+dbusservices_DATA = $(service_files)
+tpclientsdir = $(xdgdatadir)/telepathy/clients
+tpclients_DATA = $(client_files)
+
+BUILT_SOURCES=$(uninstalled_service_files) $(uninstalled_client_files)
+CLEANFILES = $(BUILT_SOURCES) $(service_files)
diff --git a/data/phoenix/dbus-services/Phoenix.Approver.service.in b/data/dbus-services/Phoenix.Approver.service.in
index a2a7f46..a2a7f46 100644
--- a/data/phoenix/dbus-services/Phoenix.Approver.service.in
+++ b/data/dbus-services/Phoenix.Approver.service.in
diff --git a/data/phoenix/dbus-services/Phoenix.Authenticator.service.in b/data/dbus-services/Phoenix.Authenticator.service.in
index 8a83fdd..8a83fdd 100644
--- a/data/phoenix/dbus-services/Phoenix.Authenticator.service.in
+++ b/data/dbus-services/Phoenix.Authenticator.service.in
diff --git a/data/phoenix/dbus-services/Phoenix.EchoCall.service.in b/data/dbus-services/Phoenix.EchoCall.service.in
index a09ffaf..a09ffaf 100644
--- a/data/phoenix/dbus-services/Phoenix.EchoCall.service.in
+++ b/data/dbus-services/Phoenix.EchoCall.service.in
diff --git a/data/phoenix/dbus-services/Phoenix.EchoText.service.in b/data/dbus-services/Phoenix.EchoText.service.in
index 66af9fc..66af9fc 100644
--- a/data/phoenix/dbus-services/Phoenix.EchoText.service.in
+++ b/data/dbus-services/Phoenix.EchoText.service.in
diff --git a/data/phoenix/Makefile.am b/data/phoenix/Makefile.am
deleted file mode 100644
index 1a948a6..0000000
--- a/data/phoenix/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-U_DBUS=uninstalled/dbus-1/services
-
-EXTRA_DIST = \
-  dbus-services/Phoenix.Approver.service.in \
-  dbus-services/Phoenix.Authenticator.service.in \
-  dbus-services/Phoenix.EchoCall.service.in \
-  dbus-services/Phoenix.EchoText.service.in \
-  telepathy-clients/Phoenix.Approver.client \
-  telepathy-clients/Phoenix.Authenticator.client \
-  telepathy-clients/Phoenix.EchoCall.client \
-  telepathy-clients/Phoenix.EchoText.client
-
-service_files = \
-  org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
-  org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
-  org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
-  org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
-
-uninstalled_service_files = \
-  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoCall.service \
-  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.EchoText.service \
-  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Approver.service \
-  $(U_DBUS)/org.freedesktop.Telepathy.Client.Phoenix.Authenticator.service
-
-client_files = \
-  telepathy-clients/Phoenix.EchoCall.client \
-  telepathy-clients/Phoenix.EchoText.client \
-  telepathy-clients/Phoenix.Approver.client \
-  telepathy-clients/Phoenix.Authenticator.client
-
-uninstalled_client_files = \
-  uninstalled/telepathy/clients/Phoenix.EchoCall.client \
-  uninstalled/telepathy/clients/Phoenix.EchoText.client \
-  uninstalled/telepathy/clients/Phoenix.Approver.client \
-  uninstalled/telepathy/clients/Phoenix.Authenticator.client
-
-$(U_DBUS)/org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
-	$(MKDIR_P) $(U_DBUS)
-	$(AM_V_GEN)sed -e "s|[@]PATH[@]|@abs_top_builddir@/src|g" $< > $@
-
-uninstalled/telepathy/clients/%.client: telepathy-clients/%.client
-	$(MKDIR_P) uninstalled/telepathy/clients
-	cp $< $@
-
-org.freedesktop.Telepathy.Client.%.service: dbus-services/%.service.in
-	$(AM_V_GEN)sed -e "s|[@]PATH[@]|$(libexecdir)|g" $< > $@
-
-
-xdgdatadir = $(pkgdatadir)/data
-dbusservicesdir = $(xdgdatadir)/dbus-1/services
-dbusservices_DATA = $(service_files)
-tpclientsdir = $(xdgdatadir)/telepathy/clients
-tpclients_DATA = $(client_files)
-
-BUILT_SOURCES=$(uninstalled_service_files) $(uninstalled_client_files)
-CLEANFILES = $(BUILT_SOURCES) $(service_files)
diff --git a/data/phoenix/telepathy-clients/Phoenix.Approver.client b/data/telepathy-clients/Phoenix.Approver.client
index 6248824..6248824 100644
--- a/data/phoenix/telepathy-clients/Phoenix.Approver.client
+++ b/data/telepathy-clients/Phoenix.Approver.client
diff --git a/data/phoenix/telepathy-clients/Phoenix.Authenticator.client b/data/telepathy-clients/Phoenix.Authenticator.client
index 68ddbd5..68ddbd5 100644
--- a/data/phoenix/telepathy-clients/Phoenix.Authenticator.client
+++ b/data/telepathy-clients/Phoenix.Authenticator.client
diff --git a/data/phoenix/telepathy-clients/Phoenix.EchoCall.client b/data/telepathy-clients/Phoenix.EchoCall.client
index 661b89f..661b89f 100644
--- a/data/phoenix/telepathy-clients/Phoenix.EchoCall.client
+++ b/data/telepathy-clients/Phoenix.EchoCall.client
diff --git a/data/phoenix/telepathy-clients/Phoenix.EchoText.client b/data/telepathy-clients/Phoenix.EchoText.client
index 271c51c..271c51c 100644
--- a/data/phoenix/telepathy-clients/Phoenix.EchoText.client
+++ b/data/telepathy-clients/Phoenix.EchoText.client