diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-30 14:53:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:33:59 +0200 |
| commit | 7d6eb69950df97a12fc723bada1eb7c1839740ca (patch) | |
| tree | 2a0c5971a0df8722aeeb14473fabb18f6bdf4992 /extensions | |
| parent | set all kde4 libs in configure (diff) | |
| download | core-7d6eb69950df97a12fc723bada1eb7c1839740ca.tar.gz core-7d6eb69950df97a12fc723bada1eb7c1839740ca.zip | |
rename functions for consistency with the rest of gbuild
Change-Id: I572a8a6dc9da4f63b7c937748b3013bab60bb6bb
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/WinResTarget_activex.mk | 7 | ||||
| -rw-r--r-- | extensions/WinResTarget_npsoplugin.mk | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 36a1629f5a9a..17a95319eecd 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -31,15 +31,14 @@ $(eval $(call gb_WinResTarget_WinResTarget,activex_res)) ifneq ($(PRODUCT),) -$(eval $(call gb_WinResTarget_set_defs,activex_res,\ - $$(DEFS) \ +$(eval $(call gb_WinResTarget_add_defs,activex_res,\ -DPRODUCT \ )) endif -$(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_activex)) +$(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/so_activex)) -$(eval $(call gb_WinResTarget_set_defs,activex_res,\ +$(eval $(call gb_WinResTarget_add_defs,activex_res,\ $$(DEFS) \ -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \ )) diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index 33926b34d64f..d6b1e9570fd1 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -30,6 +30,6 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res)) -$(eval $(call gb_WinResTarget_add_file,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: |