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 /jurt | |
| parent | ce1ac0851fe2e975f3fb47178730b914608610cf (diff) | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/CustomTarget_jnilib.mk | 9 | ||||
| -rw-r--r-- | jurt/CustomTarget_test_urp.mk | 18 |
2 files changed, 15 insertions, 12 deletions
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk index 5badfc286dc0..a74cad4bb785 100644 --- a/jurt/CustomTarget_jnilib.mk +++ b/jurt/CustomTarget_jnilib.mk @@ -27,11 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,jurt/util)) -JUJL := $(call gb_CustomTarget_get_workdir,jurt/util) +$(call gb_CustomTarget_get_target,jurt/util) : \ + $(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib -$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib - -$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir +$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib : \ + $(call gb_Library_get_target,jpipe) \ + | $(call gb_CustomTarget_get_workdir,jurt/util)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1) cd $(dir $@) && $(SOLARENV)/bin/macosx-create-bundle $< diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index f5c2f6b977fb..cf04e192d2c7 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -27,26 +27,28 @@ $(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp)) -JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp) +jurt_TESTURP := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp) -$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(JUTU)/done +$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(jurt_TESTURP)/done -$(JUTU)/done : $(JUTU)/registry.rdb $(OUTDIR)/bin/types.rdb \ +$(jurt_TESTURP)/done : $(jurt_TESTURP)/registry.rdb $(OUTDIR)/bin/types.rdb \ $(call gb_Executable_get_target_for_build,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) - $(call gb_Helper_execute,javamaker -BUCR -O$(JUTU) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ + $(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ touch $@ # TODO: would it be possible to reuse UnoApiTarget for this? -$(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \ +$(jurt_TESTURP)/registry.rdb : $(jurt_TESTURP)/interfaces.urd \ $(call gb_Executable_get_target_for_build,regmerge) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RGM,1) rm -f $@ && \ $(call gb_Helper_execute,regmerge $@ /UCR $<) -$(JUTU)/interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ - $(call gb_Executable_get_target_for_build,idlc) | $(JUTU)/urd/.dir +$(jurt_TESTURP)/interfaces.urd : \ + $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ + $(call gb_Executable_get_target_for_build,idlc) \ + | $(jurt_TESTURP)/urd/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) - $(call gb_Helper_execute,idlc -O$(JUTU) -I$(OUTDIR)/idl -cid -we $<) + $(call gb_Helper_execute,idlc -O$(jurt_TESTURP) -I$(OUTDIR)/idl -cid -we $<) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |