diff options
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/makefile.pmk | 49 | ||||
| -rw-r--r-- | odk/util/odk_rules.pmk | 5 |
2 files changed, 10 insertions, 44 deletions
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 39fea4880062..d6d1f997651a 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -64,24 +64,16 @@ IDLOUT=$(SOLARIDLDIR) XMLOUT=$(SOLARXMLDIR) LIBOUT=$(SOLARLIBDIR) -CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl -CONVERTTAGFLAGNAME=converttags_html_files.flag -CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME) - MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" -MY_COPY=$(GNUCOPY) -MY_COPY_RECURSIVE=$(GNUCOPY) -r -.ELSE -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || \ + "$(OS)"=="AIX" || "$(OS)"=="DRAGONFLY" MY_COPY=$(GNUCOPY) MY_COPY_RECURSIVE=$(GNUCOPY) -r .ELSE MY_COPY=$(GNUCOPY) -u MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF -.ENDIF MY_DELETE_RECURSIVE=rm -rf MY_TEXTCOPY=@cp @@ -90,8 +82,6 @@ MY_TEXTCOPY=@cp #-------------------- # WNT ONLY #-------------------- -#MY_DELETE_RECURSIVE=+del /sxyf -#MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll @@ -110,11 +100,6 @@ DESTDIRCLI=$(DESTDIR)/cli .ELSE #-------------------- -# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp - -#-------------------- -#MY_DELETE_RECURSIVE=rm -rf -#MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib .IF "$(OS)"=="MACOSX" @@ -126,56 +111,43 @@ MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" -############## # SOLARIS SPARC -############## DESTPLATFROM=solsparc .ELIF "$(OS)$(CPU)"=="SOLARISU" -############## # SOLARIS SPARC 64 -############## DESTPLATFROM=solsparc64 .ELIF "$(OS)$(CPU)"=="SOLARISI" -########## # SOLARIS INTEL -########## DESTPLATFROM=solintel .ELIF "$(OS)"=="LINUX" -########### # LINUX -########### DESTPLATFROM=linux .ELIF "$(OS)"=="NETBSD" -########### # NETBSD -########### DESTPLATFROM=netbsd .ELIF "$(OS)"=="FREEBSD" -########### # FREEBSD -########### DESTPLATFROM=freebsd +.ELIF "$(OS)"=="DRAGONFLY" +DESTPLATFROM=dragonfly + .ELIF "$(OS)"=="MACOSX" -########### # MACOSX -########### DESTPLATFROM=macosx -.ENDIF -#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin -#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib -#DESTDIRDLL=$(DESTDIRLIB) +.ELIF "$(OS)"=="AIX" +# MACOSX +DESTPLATFROM=aix .ENDIF -#MY_TEXTCOPY_SOURCEPRE=< -#MY_TEXTCOPY_TARGETPRE=> +.ENDIF INCLUDETOPDIRLIST= \ @@ -188,8 +160,7 @@ INCLUDETOPDIRLIST= \ $(INCOUT)/uno \ $(INCOUT)/cppu \ $(INCOUT)/cppuhelper \ - $(INCOUT)/registry \ - $(INCOUT)/stl + $(INCOUT)/registry .IF "$(GUI)"=="WNT" INCLUDETOPDIRLIST += $(INCOUT)/systools diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index bb62664053f1..b28e28c6853a 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -88,11 +88,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js $(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk @@-rm -f $@ -.IF "$(COMEX)"=="7" - $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@ -.ELSE $(MY_TEXTCOPY) $< $@ -.ENDIF $(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd @@-rm -f $@ @@ -141,7 +137,6 @@ $(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loa $(DESTDIRIDL)/% : $(IDLOUT)/% $(MY_TEXTCOPY) $< $@ -# @touch $(IDL_DOCU_CLEANUP_FLAG) $(DESTDIRINC)/udkversion.mk : @@-rm -f $@ |