diff options
| author | David Tardon <dtardon@redhat.com> | 2013-03-31 20:32:35 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-31 20:39:20 +0200 |
| commit | 911989ae03937ee716a6c1833b2593540500ba59 (patch) | |
| tree | e1f8bbf25c80621eea633f3b011f7e9288e96f0a /odk | |
| parent | 56f1ec87d26ffcd970ab4225e1652a7a698a845c (diff) | |
add $OUTDIR/pck to search path for SDK product
... so it is possible to drop the copying-to-bin hack in ZipPackage.mk
and ZipUnoApi.mk .
Change-Id: Ic506e25a21003fca491d0902b5d8f282775da229
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/Zip_odkcommon.mk | 12 | ||||
| -rw-r--r-- | odk/Zip_odkexamples.mk | 11 |
2 files changed, 0 insertions, 23 deletions
diff --git a/odk/Zip_odkcommon.mk b/odk/Zip_odkcommon.mk index a68aaffee679..11827bda39d5 100644 --- a/odk/Zip_odkcommon.mk +++ b/odk/Zip_odkcommon.mk @@ -20,16 +20,4 @@ $(eval $(call gb_Zip_add_commandoptions,odkcommon,-r)) # dependencies which custom targets need to be built. $(call gb_Zip_get_target,odkcommon) : $(odkcommon_ZIPDEPS) -#FIXME: scp2 seems to require the zip to be in bin -$(call gb_Zip_get_final_target,odkcommon) : $(OUTDIR)/bin/odkcommon.zip -$(call gb_Zip_get_clean_target,odkcommon) : clean_odkcommon_zip - -$(OUTDIR)/bin/odkcommon.zip : $(call gb_Zip_get_target,odkcommon) - $(call gb_Deliver_deliver,$<,$@) - -.PHONY : clean_odkcommon_zip -clean_odkcommon_zip: - rm -f $(OUTDIR)/bin/odkcommon.zip - - # vim: set noet sw=4 ts=4: diff --git a/odk/Zip_odkexamples.mk b/odk/Zip_odkexamples.mk index 048370ffee73..ed9ee29f9812 100644 --- a/odk/Zip_odkexamples.mk +++ b/odk/Zip_odkexamples.mk @@ -25,15 +25,4 @@ $(eval $(call gb_Zip_add_files,odkexamples,\ examples \ )) -#FIXME: scp2 seems to require the zip to be in bin -$(call gb_Zip_get_final_target,odkexamples) : $(OUTDIR)/bin/odkexamples.zip | $(OUTDIR)/bin/.dir -$(call gb_Zip_get_clean_target,odkexamples) : clean_odkexamples_zip - -$(OUTDIR)/bin/odkexamples.zip : $(call gb_Zip_get_target,odkexamples) - $(call gb_Deliver_deliver,$<,$@) - -.PHONY : clean_odkexamples_zip -clean_odkexamples_zip: - rm -f $(OUTDIR)/bin/odkexamples.zip - # vim: set noet sw=4 ts=4: |