diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
| commit | 23dd856d3c70a63dd47ae2a09a75833267296432 (patch) | |
| tree | 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /dbaccess | |
| parent | 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff) | |
| parent | 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff) | |
Merge branch 'feature/gbuild_extensions'
Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/AllLangResTarget_dbu.mk | 2 | ||||
| -rw-r--r-- | dbaccess/AllLangResTarget_dbui.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 15b6806005c6..177bfa307a01 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -90,6 +90,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk index 7478fc2c4474..f17c96c506d6 100644 --- a/dbaccess/AllLangResTarget_dbui.mk +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -92,6 +92,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc) # vim: set noet sw=4 ts=4: |