diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-16 13:23:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-16 13:23:55 +0000 |
| commit | 49da6500ca2957bd70ae65acdef3f044a0fc86a9 (patch) | |
| tree | da5e2aec19a30f1a21dabc3ded9dd6bd55a63d77 /odk/util | |
| parent | 028eb8eee3961572b3dc03a8a960073c85b422ce (diff) | |
INTEGRATION: CWS ause085 (1.26.30); FILE MERGED
2007/12/12 09:40:24 hjs 1.26.30.1: #i81694# fix .class copy rule to copy just one class and subclasses
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/odk_rules.pmk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index ea32b91367c9..d4b2919b11c1 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -2,9 +2,9 @@ # # $RCSfile: odk_rules.pmk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.27 $ # -# last change: $Author: hr $ $Date: 2007-07-31 13:58:22 $ +# last change: $Author: ihi $ $Date: 2008-01-16 14:23:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -144,8 +144,11 @@ $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(GNUCOPY) $(DLLOUT)$/$(@:f) $@ $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class - @@-$(RM) $(@:db)*.class - $(COPY) $(<:db)*.class $(@:d) + @@-$(RM) $(@:db).class + $(COPY) $(<:db).class $(@:d) +# deal with subclasses + @@-$(RM) $(@:db)$(EMQ)$$*.class + -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d) $(DESTDIRIDL)$/% : $(IDLOUT)$/% $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ |