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 /svx | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Executable_gengal.bin.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 61fe0505a9f3..21df00ef2741 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -27,15 +27,15 @@ #************************************************************************* ifeq ($(OS),WNT) -gengalbin := gengal +svx_GENGALBIN := gengal else -gengalbin := gengal.bin +svx_GENGALBIN := gengal.bin endif -$(eval $(call gb_Executable_Executable,$(gengalbin))) +$(eval $(call gb_Executable_Executable,$(svx_GENGALBIN))) -$(eval $(call gb_Executable_set_include,$(gengalbin),\ +$(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\ $$(INCLUDE) \ -I$(SRCDIR)/svx/inc/ \ -I$(SRCDIR)/svx/inc/pch \ @@ -44,11 +44,11 @@ $(eval $(call gb_Executable_set_include,$(gengalbin),\ -I$(OUTDIR)/inc/offapi \ )) -$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\ +$(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\ $$(CXXFLAGS) \ )) -$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ sal \ tl \ svl \ @@ -61,16 +61,16 @@ $(eval $(call gb_Executable_use_libraries,$(gengalbin),\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\ +$(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) -$(eval $(call gb_Executable_use_static_libraries,$(gengalbin),\ +$(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\ vclmain \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ kernel32 \ msvcrt \ $(gb_Library_win32_OLDNAMES) \ @@ -80,7 +80,7 @@ $(eval $(call gb_Executable_use_libraries,$(gengalbin),\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ dl \ pthread \ )) |