summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-06 15:58:44 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-06 15:58:44 +0100
commit0128b2300820aec169078bdc481d5b44d1008d08 (patch)
tree226f7c157d68a4f988d81887429bd9d6e6582357
parentb5dea6b3dd85d1b9555ded5f0d54aed1acf2be81 (diff)
gnumake2: added component registration
-rw-r--r--framework/Library_fwk.mk2
-rw-r--r--framework/Library_fwl.mk2
-rw-r--r--framework/Library_fwm.mk2
-rw-r--r--sfx2/Library_sfx.mk (renamed from sfx2/Library_sfx2.mk)2
-rwxr-xr-xsfx2/Module_sfx2.mk2
-rw-r--r--xmloff/Library_xo.mk2
-rw-r--r--xmloff/Library_xof.mk2
7 files changed, 13 insertions, 1 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index c9f52c1f26..c0135dc650 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,fwk))
$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework))
+$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
+
$(eval $(call gb_Library_set_include,fwk,\
-I$(SRCDIR)/framework/inc/pch \
-I$(SRCDIR)/framework/source/inc \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 7af0fef7dd..ed4cf040b7 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,fwl))
+$(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
+
$(eval $(call gb_Library_set_include,fwl,\
-I$(SRCDIR)/framework/inc \
-I$(SRCDIR)/framework/inc/pch \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index 56a6a9f74f..d31b81ffc9 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,fwm))
+$(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
+
$(eval $(call gb_Library_set_include,fwm,\
-I$(SRCDIR)/framework/inc/pch \
-I$(SRCDIR)/framework/inc \
diff --git a/sfx2/Library_sfx2.mk b/sfx2/Library_sfx.mk
index fbe4fb4c59..fb88cd0150 100644
--- a/sfx2/Library_sfx2.mk
+++ b/sfx2/Library_sfx.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/preco
$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
+$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+
$(eval $(call gb_Library_set_include,sfx,\
-I$(SRCDIR)/sfx2/inc \
-I$(SRCDIR)/sfx2/inc/sfx2 \
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b0c026c373..f6ac7c4c05 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_Module,sfx2))
$(eval $(call gb_Module_add_targets,sfx2,\
AllLangResTarget_sfx2 \
- Library_sfx2 \
+ Library_sfx \
Package_inc \
Package_sdi \
))
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 8ebf82b5cf..22143b1d2b 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,xo))
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+
$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff))
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 320aafbf12..710e836c09 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,xof))
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+
$(eval $(call gb_Library_set_include,xof,\
-I$(SRCDIR)/xmloff/inc/pch \
-I$(SRCDIR)/xmloff/inc \