summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-01-04 01:30:44 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-01-04 01:48:03 -0600
commita8bdde191c83b3cbdd7647a46ed0701d573f886c (patch)
tree4dc64227bf0b0efa6fc8b7383bb5be6452f2b89f
parentfd6649175956c9d322fe02fd413fe6970aa6819e (diff)
fix sanedlg.hrc dep issue due to gbuildification of extensions
-rw-r--r--extensions/AllLangResTarget_scn.mk (renamed from extensions/AllLangResTarget_san.mk)11
-rw-r--r--extensions/Module_extensions.mk2
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp2
3 files changed, 10 insertions, 5 deletions
diff --git a/extensions/AllLangResTarget_san.mk b/extensions/AllLangResTarget_scn.mk
index 2301f6cf7b55..8b8dde4fdb03 100644
--- a/extensions/AllLangResTarget_san.mk
+++ b/extensions/AllLangResTarget_scn.mk
@@ -26,16 +26,21 @@
# instead of those above.
#
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,san))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn))
-$(eval $(call gb_AllLangResTarget_set_reslocation,san,extensions/source/scanner))
+$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner))
-$(eval $(call gb_AllLangResTarget_add_srs,san,\
+$(eval $(call gb_AllLangResTarget_add_srs,scn,\
scn/res \
))
$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
+$(eval $(call gb_SrsTarget_set_include,scn/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/extensions/source/scanner \
+))
+
$(eval $(call gb_SrsTarget_add_files,scn/res,\
extensions/source/scanner/grid.src \
extensions/source/scanner/sanedlg.src \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 348b95eeca95..62caaf6dafe5 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_bib \
AllLangResTarget_dbp \
AllLangResTarget_pcr \
- AllLangResTarget_san \
+ AllLangResTarget_scn \
AllLangResTarget_upd \
AllLangResTarget_updchk \
Configuration_updchk \
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 6a23a9f8ef77..311dd9fe158c 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -68,7 +68,7 @@ STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
#ifdef UNX
-STD_RES_FILE( gid_File_Res_San, san )
+STD_RES_FILE( gid_File_Res_San, scn )
#endif