diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-23 19:53:09 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-24 15:56:09 +0200 |
| commit | 99fb1839ef1679bc2904ade216f8c5ebb5c6989a (patch) | |
| tree | bd0a756e065bd6df1ccb89e0abdec53df33b4fd3 /odk/CustomTarget_classes.mk | |
| parent | d7186fe43618eeb9082c34a65ccb303f7bbc770d (diff) | |
only put uno loader classes into one zip
These are put into uno_loader_classes.zip, which is then not used at
all, and odkcommon.zip, which is used for creation of install sets.
Seriously?!
Change-Id: I28b5bc73857cf524fb12f7918acd2891ff12d166
Diffstat (limited to 'odk/CustomTarget_classes.mk')
| -rw-r--r-- | odk/CustomTarget_classes.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk index ad59a4af0355..f813bccd203e 100644 --- a/odk/CustomTarget_classes.mk +++ b/odk/CustomTarget_classes.mk @@ -9,6 +9,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/classes)) +$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/classes,\ + java.done \ +)) + $(eval $(call gb_JavaClassSet_JavaClassSet,loader)) $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ @@ -18,14 +22,9 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ odk/source/com/sun/star/lib/loader/WinRegKeyException \ )) -odkcommon_ZIPLIST += classes/com/sun/star/lib/loader -odkcommon_ZIPDEPS += $(odk_WORKDIR)/classes/java.done - -$(call gb_CustomTarget_get_target,odk/odkcommon/classes): $(odk_WORKDIR)/classes/java.done $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader) - mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) + cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \ touch $@ # vim: set noet sw=4 ts=4: |