Index: source/OOSupport/makefile.mk =================================================================== RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v retrieving revision 1.9 diff -u -r1.9 makefile.mk --- source/OOSupport/makefile.mk 28 Apr 2003 17:25:36 -0000 1.9 +++ source/OOSupport/makefile.mk 30 Jul 2003 15:34:33 -0000 @@ -74,6 +74,13 @@ # Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" + +dummy: + @echo "Nothing to build for OS $(OS)" + +.ELSE # "$(OS)"=="MACOSX" + JARFILES = $(JARPATH)$/ridl.jar$(PATH_SEPERATOR)$(JARPATH)$/juh.jar$(PATH_SEPERATOR)$(JARPATH)$/jurt.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jarpackager.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/openide.jar$(PATH_SEPERATOR)$(JARPATH)$/jakarta-regexp-1.2.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/nbantext.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jhall.jar JAVACLASSFILES = $(subst,$(CLASSDIR)$/, $(shell $(FIND) $(CLASSDIR)$/org$/netbeans$/modules$/openoffice -name *.class) ) @@ -339,3 +346,5 @@ +-mkdir $(CLASSDIR)$/netbeans$/modules +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans + +.ENDIF Index: source/bean/com/sun/star/beans/makefile.mk =================================================================== RCS file: /cvs/api/odk/source/bean/com/sun/star/beans/makefile.mk,v retrieving revision 1.3 diff -u -r1.3 makefile.mk --- source/bean/com/sun/star/beans/makefile.mk 26 Mar 2003 13:40:45 -0000 1.3 +++ source/bean/com/sun/star/beans/makefile.mk 30 Jul 2003 15:34:34 -0000 @@ -68,6 +68,13 @@ # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.IF "$(OS)"=="MACOSX" + +dummy: + @echo "Nothing to build for OS $(OS)" + +.ELSE # "$(OS)"=="MACOSX" + JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) @@ -86,6 +93,8 @@ $(CLASSDIR)$/$(PACKAGE)$/NativeService.class \ $(CLASSDIR)$/$(PACKAGE)$/LocalOfficeConnection.class \ $(CLASSDIR)$/$(PACKAGE)$/LocalOfficeWindow.class + +.ENDIF # --- Targets ------------------------------------------------------ Index: source/bean/native/unix/makefile.mk =================================================================== RCS file: /cvs/api/odk/source/bean/native/unix/makefile.mk,v retrieving revision 1.9 diff -u -r1.9 makefile.mk --- source/bean/native/unix/makefile.mk 12 Jun 2003 10:08:14 -0000 1.9 +++ source/bean/native/unix/makefile.mk 30 Jul 2003 15:34:34 -0000 @@ -12,6 +12,13 @@ # --- Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" + +dummy: + @echo "Nothing to build for OS $(OS)" + +.ELSE # "$(OS)"=="MACOSX" + SLOFILES = \ $(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj # $(SLO)$/com_sun_star_beans_NativeConnection.obj \ @@ -28,6 +35,8 @@ .ENDIF NO_SHL1DESCRIPTION=TRUE + +.ENDIF # --- Targets ------------------------------------------------------ Index: util/makefile.pmk =================================================================== RCS file: /cvs/api/odk/util/makefile.pmk,v retrieving revision 1.37 diff -u -r1.37 makefile.pmk --- util/makefile.pmk 16 Jul 2003 17:39:21 -0000 1.37 +++ util/makefile.pmk 30 Jul 2003 15:34:34 -0000 @@ -99,9 +99,14 @@ MY_COPY=$(GNUCOPY) MY_COPY_RECURSIVE=$(GNUCOPY) -r .ELSE +.IF "$(OS)"=="MACOSX" +MY_COPY=$(GNUCOPY) +MY_COPY_RECURSIVE=$(GNUCOPY) -r +.ELSE MY_COPY=$(GNUCOPY) -u MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF +.ENDIF .IF "$(GUI)"=="WNT" #-------------------- @@ -131,7 +136,11 @@ MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib +.IF "$(OS)"=="MACOSX" +MY_DLLPOSTFIX=.dylib +.ELSE MY_DLLPOSTFIX=.so +.ENDIF MY_DLLOUT=$(OUT)$/lib DLLOUT=$(SOLARLIBDIR)