diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
| commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
| tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /desktop | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 9 | ||||
| -rw-r--r-- | desktop/Executable_unopkg.bin.mk | 20 |
2 files changed, 15 insertions, 14 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 8d49935f6a38..74eb6c9d6e3c 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -27,11 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice)) -DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice) +$(call gb_CustomTarget_get_target,desktop/soffice) : \ + $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh -$(call gb_CustomTarget_get_target,desktop/soffice) : $(DESO)/soffice.sh - -$(DESO)/soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh | $(DESO)/.dir +$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \ + $(SRCDIR)/desktop/scripts/soffice.sh \ + | $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) ifneq ($(JITC_PROCESSOR_TYPE),) sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index cf22afdbdd67..9303eefeefb1 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -26,21 +26,21 @@ # instead of those above. ifeq ($(OS),WNT) -unopkgbin := unopkg_bin +desktop_UNOPKGBIN := unopkg_bin else -unopkgbin := unopkg.bin +desktop_UNOPKGBIN := unopkg.bin endif -$(eval $(call gb_Executable_Executable,$(unopkgbin))) +$(eval $(call gb_Executable_Executable,$(desktop_UNOPKGBIN))) -$(eval $(call gb_Executable_set_targettype_gui,$(unopkgbin),YES)) +$(eval $(call gb_Executable_set_targettype_gui,$(desktop_UNOPKGBIN),YES)) -$(eval $(call gb_Executable_set_include,$(unopkgbin),\ +$(eval $(call gb_Executable_set_include,$(desktop_UNOPKGBIN),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\ +$(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ comphelper \ sal \ tl \ @@ -48,15 +48,15 @@ $(eval $(call gb_Executable_use_libraries,$(unopkgbin),\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_cobjects,$(unopkgbin),\ +$(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) ifeq ($(OS),WNT) -# the resulting executable is called $(unopkgbin).exe, copy it to $(unopkgbin) -$(eval $(call gb_Package_Package,$(unopkgbin),$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,$(unopkgbin),bin/unopkg.bin,$(unopkgbin).exe)) +# the resulting executable is called $(desktop_UNOPKGBIN).exe, copy it to $(desktop_UNOPKGBIN) +$(eval $(call gb_Package_Package,$(desktop_UNOPKGBIN),$(OUTDIR)/bin)) +$(eval $(call gb_Package_add_file,$(desktop_UNOPKGBIN),bin/unopkg.bin,$(desktop_UNOPKGBIN).exe)) endif |