diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2002-04-26 11:14:44 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2002-04-26 11:14:44 +0000 |
| commit | 3bfefa7dc53b3a3d73cc8d8c2d3c2885da7d529c (patch) | |
| tree | 0319569989e111d262a6f7c6853f028cacce908f | |
| parent | c290f0c0d7551a8b622734de7fe8b2501f275733 (diff) | |
#98851# pack officebean library, adapt name for all paltforms (name, path, destination, ...)
| -rw-r--r-- | odk/pack/copying/makefile.mk | 4 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 41 |
2 files changed, 35 insertions, 10 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 869a2069cb36..657c4e1938b9 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -309,7 +309,7 @@ all : \ $(EXAMPLESLIST) \ $(DESTIDLLIST) \ $(DESTDIRBIN)$/applicat.rdb \ - $(DESTDIRLIB)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) \ $(DESTDIR)$/settings$/dk.mk \ $(DESTDIR)$/classes$/unoil.jar \ $(DESTDIR)$/classes$/officebean.jar \ @@ -356,7 +356,7 @@ $(DESTDIR)$/classes$/officebean.jar : $(OUT)$/class$/officebean.jar $(DESTDIRBIN)$/applicat.rdb : $(BINOUT)$/applicat.rdb $(GNUCOPY) -p $(BINOUT)$/applicat.rdb $@ -$(DESTDIRLIB)$/libofficebean.so : $(OUT)$/lib$/libofficebean.so +$(DESTDIRDLL)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) : $(MY_DLLOUT)$/$(MY_DLLPREFIX)officebean$(MY_DLLPOSTFIX) $(GNUCOPY) -p $? $@ $(DESTDIR)$/settings$/dk.mk : $(PRJ)$/util$/dk.mk diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 464105ed7ed7..e944875ed085 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -46,6 +46,12 @@ MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll +MY_DLLOUT=$(OUT)$/bin +DLLOUT=$(SOLARBINDIR) + +DESTDIRBIN=$(DESTDIR)$/windows$/bin +DESTDIRLIB=$(DESTDIR)$/windows$/lib +DESTDIRDLL=$(DESTDIRBIN) .ELSE #-------------------- @@ -58,24 +64,43 @@ MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib MY_DLLPOSTFIX=.so - -.ENDIF -MY_TEXTCOPY_SOURCEPRE=< -MY_TEXTCOPY_TARGETPRE=> +MY_DLLOUT=$(OUT)$/lib +DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" +############## +# SOLARIS SPARC +############## DESTDIRBIN=$(DESTDIR)$/solsparc$/bin DESTDIRLIB=$(DESTDIR)$/solsparc$/lib +DESTDIRDLL=$(DESTDIRLIB) + .ELIF "$(OS)$(CPU)"=="SOLARISI" +########## +# SOLARIS INTEL +########## DESTDIRBIN=$(DESTDIR)$/solia$/bin DESTDIRLIB=$(DESTDIR)$/solia$/lib +DESTDIRDLL=$(DESTDIRLIB) + .ELIF "$(OS)"=="LINUX" +########### +# LINUX +########### DESTDIRBIN=$(DESTDIR)$/linux$/bin DESTDIRLIB=$(DESTDIR)$/linux$/lib -.ELIF "$(OS)"=="IRIX" +DESTDIRDLL=$(DESTDIRLIB) + +.ELIF "$(OS)"=="IRIX " +########### +# IRIX +########### DESTDIRBIN=$(DESTDIR)$/irix$/bin DESTDIRLIB=$(DESTDIR)$/irix$/lib -.ELIF "$(OS)"=="WNT" -DESTDIRBIN=$(DESTDIR)$/windows$/bin -DESTDIRLIB=$(DESTDIR)$/windows$/lib +DESTDIRDLL=$(DESTDIRLIB) +.ENDIF + .ENDIF + +MY_TEXTCOPY_SOURCEPRE=< +MY_TEXTCOPY_TARGETPRE=> |