Attachment #8152 for issue #17646

View | Details | Raw Unified | Return to issue 17646
Collapse All | Expand All

Lines 74-79 Link Here

(-)source/OOSupport/makefile.mk (+9 lines)
74		74
75	# Files --------------------------------------------------------	75	# Files --------------------------------------------------------
76		76
		77	.IF "$(OS)"=="MACOSX"
		78
		79	dummy:
		80	@echo "Nothing to build for OS $(OS)"
		81
		82	.ELSE # "$(OS)"=="MACOSX"
		83
77	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	84	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
78		85
79	JAVACLASSFILES = $(subst,$(CLASSDIR)$/, $(shell $(FIND) $(CLASSDIR)$/org$/netbeans$/modules$/openoffice -name *.class) )	86	JAVACLASSFILES = $(subst,$(CLASSDIR)$/, $(shell $(FIND) $(CLASSDIR)$/org$/netbeans$/modules$/openoffice -name *.class) )
Lines 339-341 Link Here
339	+-mkdir $(CLASSDIR)$/netbeans$/modules	346	+-mkdir $(CLASSDIR)$/netbeans$/modules
340	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule	347	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule
341	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans	348	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
		349
		350	.ENDIF

Lines 68-73 Link Here

(-)source/bean/com/sun/star/beans/makefile.mk (+9 lines)
68	# --- Settings -----------------------------------------------------	68	# --- Settings -----------------------------------------------------
69	.INCLUDE: settings.mk	69	.INCLUDE: settings.mk
70		70
		71	.IF "$(OS)"=="MACOSX"
		72
		73	dummy:
		74	@echo "Nothing to build for OS $(OS)"
		75
		76	.ELSE # "$(OS)"=="MACOSX"
		77
71	JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar	78	JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar
72	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))	79	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
73		80
Lines 86-91 Link Here
86	$(CLASSDIR)$/$(PACKAGE)$/NativeService.class \	93	$(CLASSDIR)$/$(PACKAGE)$/NativeService.class \
87	$(CLASSDIR)$/$(PACKAGE)$/LocalOfficeConnection.class \	94	$(CLASSDIR)$/$(PACKAGE)$/LocalOfficeConnection.class \
88	$(CLASSDIR)$/$(PACKAGE)$/LocalOfficeWindow.class	95	$(CLASSDIR)$/$(PACKAGE)$/LocalOfficeWindow.class
		96
		97	.ENDIF
89		98
90	# --- Targets ------------------------------------------------------	99	# --- Targets ------------------------------------------------------
91		100

Lines 12-17 Link Here

(-)source/bean/native/unix/makefile.mk (+9 lines)
12		12
13	# --- Files --------------------------------------------------------	13	# --- Files --------------------------------------------------------
14		14
		15	.IF "$(OS)"=="MACOSX"
		16
		17	dummy:
		18	@echo "Nothing to build for OS $(OS)"
		19
		20	.ELSE # "$(OS)"=="MACOSX"
		21
15	SLOFILES = \	22	SLOFILES = \
16	$(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj	23	$(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj
17	# $(SLO)$/com_sun_star_beans_NativeConnection.obj \	24	# $(SLO)$/com_sun_star_beans_NativeConnection.obj \
Lines 28-33 Link Here
28	.ENDIF	35	.ENDIF
29		36
30	NO_SHL1DESCRIPTION=TRUE	37	NO_SHL1DESCRIPTION=TRUE
		38
		39	.ENDIF
31		40
32	# --- Targets ------------------------------------------------------	41	# --- Targets ------------------------------------------------------
33		42

Lines 99-107 Link Here

(-)util/makefile.pmk (+9 lines)
99	MY_COPY=$(GNUCOPY)	99	MY_COPY=$(GNUCOPY)
100	MY_COPY_RECURSIVE=$(GNUCOPY) -r	100	MY_COPY_RECURSIVE=$(GNUCOPY) -r
101	.ELSE	101	.ELSE
		102	.IF "$(OS)"=="MACOSX"
		103	MY_COPY=$(GNUCOPY)
		104	MY_COPY_RECURSIVE=$(GNUCOPY) -r
		105	.ELSE
102	MY_COPY=$(GNUCOPY) -u	106	MY_COPY=$(GNUCOPY) -u
103	MY_COPY_RECURSIVE=$(GNUCOPY) -urf	107	MY_COPY_RECURSIVE=$(GNUCOPY) -urf
104	.ENDIF	108	.ENDIF
		109	.ENDIF
105		110
106	.IF "$(GUI)"=="WNT"	111	.IF "$(GUI)"=="WNT"
107	#--------------------	112	#--------------------
Lines 131-137 Link Here
131	MY_TEXTCOPY= tr -d "\015"	136	MY_TEXTCOPY= tr -d "\015"
132		137
133	MY_DLLPREFIX=lib	138	MY_DLLPREFIX=lib
		139	.IF "$(OS)"=="MACOSX"
		140	MY_DLLPOSTFIX=.dylib
		141	.ELSE
134	MY_DLLPOSTFIX=.so	142	MY_DLLPOSTFIX=.so
		143	.ENDIF
135	MY_DLLOUT=$(OUT)$/lib	144	MY_DLLOUT=$(OUT)$/lib
136	DLLOUT=$(SOLARLIBDIR)	145	DLLOUT=$(SOLARLIBDIR)
137		146

Return to issue 17646