summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-03-23 10:35:09 +0100
committerDavid Tardon <dtardon@redhat.com>2014-03-23 23:03:58 +0100
commitb1d00137f2ae0dde7ba0d4a42f184538120a05e5 (patch)
tree6214d300ca0f40bcf69cc1c038b472aa067380fe
parentc768cc508e1ff3ae0dc7503f4c6566e66bc7fd13 (diff)
remove unnecessary util dir
Change-Id: I66e1882d14c59abeb6aa01b662dfc3a89238d3c0
-rwxr-xr-xpostprocess/Rdb_services.mk4
-rw-r--r--writerperfect/Library_wpftdraw.mk2
-rw-r--r--writerperfect/Library_wpftwriter.mk2
-rw-r--r--writerperfect/source/draw/wpftdraw.component (renamed from writerperfect/util/wpftdraw.component)0
-rw-r--r--writerperfect/source/writer/wpftwriter.component (renamed from writerperfect/util/wpftwriter.component)0
5 files changed, 4 insertions, 4 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 2e5a933978f8..e6cd8b55b1c8 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -113,9 +113,9 @@ $(eval $(call gb_Rdb_add_components,services,\
sccomp/source/solver/solver \
) \
writerfilter/util/writerfilter \
- writerperfect/util/wpftwriter \
- writerperfect/util/wpftdraw \
+ writerperfect/source/draw/wpftdraw \
writerperfect/source/impress/wpftimpress \
+ writerperfect/source/writer/wpftwriter \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter-out X86_64,$(CPUNAME)), \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 84bb959fde5b..b2cfc3636577 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Library_Library,wpftdraw))
-$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/util/wpftdraw))
+$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wpftdraw))
$(eval $(call gb_Library_set_include,wpftdraw,\
$$(INCLUDE) \
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index cfcdf5da69cd..81008f3dc65b 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Library_Library,wpftwriter))
-$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/util/wpftwriter))
+$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwriter))
$(eval $(call gb_Library_set_include,wpftwriter,\
$$(INCLUDE) \
diff --git a/writerperfect/util/wpftdraw.component b/writerperfect/source/draw/wpftdraw.component
index d52411659717..d52411659717 100644
--- a/writerperfect/util/wpftdraw.component
+++ b/writerperfect/source/draw/wpftdraw.component
diff --git a/writerperfect/util/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
index 8a204ec24746..8a204ec24746 100644
--- a/writerperfect/util/wpftwriter.component
+++ b/writerperfect/source/writer/wpftwriter.component