diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:11:44 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:11:44 +0000 |
| commit | 1c0a821708dbf674d74f032ff22792a2cd34ede1 (patch) | |
| tree | d241a75459c0d6a788d3dc4dc6cb8a1d135a5ed7 /odk/pack | |
| parent | 31a7f24896b6cd2cad7f459f4af41be543343574 (diff) | |
INTEGRATION: CWS unowinregcross (1.79.2); FILE MERGED
2006/07/26 17:18:47 rene 1.79.2.4: RESYNC: (1.79-1.80); FILE MERGED
2006/07/17 08:45:48 rene 1.79.2.3: #i49718# fix --without-java build; make odk build-depend on external
2006/07/17 00:02:01 rene 1.79.2.2: #i49718# typo
2006/07/16 15:46:24 rene 1.79.2.1: #i49718# make unowinreg.dll rebuildable
Diffstat (limited to 'odk/pack')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 35d8bd8c059e..1fba0daef494 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.80 $ +# $Revision: 1.81 $ # -# last change: $Author: obo $ $Date: 2006-07-13 12:03:32 $ +# last change: $Author: ihi $ $Date: 2006-08-03 15:11:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -209,13 +209,17 @@ DIR_FILE_LIST=\ $(DESTIDLLIST) \ $(DESTINCLUDELIST) \ $(DESTCLASSESLIST) \ - $(DESTDIRJAR)$/win$/unowinreg.dll \ $(DESTDIRDOCU)$/common$/spec$/xml_format$/xml_specification.pdf +.IF "$(SOLAR_JAVA)" != "" +DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll +.ENDIF + DIR_DIRECTORY_LIST:=$(uniq $(DIR_FILE_LIST:d)) DIR_CREATE_FLAG:=$(MISC)$/copying_dirs_created.txt DIR_FILE_FLAG:=$(MISC)$/copying_files.txt +.IF "$(SOLAR_JAVA)" != "" # Special work for simple uno bootstrap mechanism # zip uno loader class files and winreg helper library for later # use in the build process (e.g. helper tools) @@ -224,6 +228,8 @@ MYZIPFLAGS=-u -r MYZIPDIR=$(DESTDIRJAR) MYZIPLIST=com$/* win$/* +.ENDIF + #-------------------------------------------------- # TARGETS #-------------------------------------------------- @@ -237,5 +243,7 @@ all : \ #-------------------------------------------------- .INCLUDE: $(PRJ)$/util$/odk_rules.pmk -$(MYZIPTARGET) : $(DESTDIRJAR)$/win$/unowinreg.dll $(DESTCLASSESLIST) +.IF "$(SOLAR_JAVA)" != "" +$(MYZIPTARGET) : $(BIN)$/unowinreg.dll $(DESTCLASSESLIST) +cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ..$/..$/..$/bin$/$(MYZIPTARGET:b) $(MYZIPLIST) +.ENDIF |