Latest OS/2 makefile changes. Bug 34106. Batch 14, 15, & 16.

git-svn-id: svn://10.0.0.236/trunk@69982 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/rules.mk

@@ -103,7 +103,7 @@ endif
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 EXTRA_DSO_LIBS		:= $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/,$(EXTRA_DSO_LIBS)))
-EXTRA_DSO_LIBS		:= $(filter-out %/bin %lib,$(EXTRA_DSO_LIBS))
+EXTRA_DSO_LIBS		:= $(filter-out %/bin %/lib,$(EXTRA_DSO_LIBS))
 else
 EXTRA_DSO_LIBS		:= $(addprefix -l,$(EXTRA_DSO_LIBS))
 endif
@@ -541,7 +541,7 @@ else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin
 endif
 endif
-        +$(LOOP_OVER_DIRS)
+	+$(LOOP_OVER_DIRS)
 endif # OS2
 
 checkout:
@@ -684,7 +684,7 @@ $(DEF_FILE): $(DEF_OBJS)
 ifeq ($(XPCOM_SWITCH),1)
 	$(FILTER) $(DEF_OBJS) >> $(DEF_FILE)
 else
-	$(FILTER) $(DEF_OBJS) | grep -v getter_Copies__FR >> $(DEF_FILE)
+	$(FILTER) $(DEF_OBJS) | grep -v getter_Copies__FR| grep -v getc | grep -v putc | grep -v __ctime >> $(DEF_FILE)
 endif
 	$(ADD_TO_DEF_FILE)
 $(IMPORT_LIBRARY): $(OBJS) $(DEF_FILE)
@@ -711,6 +711,7 @@ endif
 
 $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(SHARED_LIBRARY_LIBS) Makefile Makefile.in
 	rm -f $@
+ifneq ($(OS_ARCH),OS2)
 ifneq ($(OS_ARCH),OpenVMS)
 ifdef NO_LD_ARCHIVE_FLAGS
 ifdef SHARED_LIBRARY_LIBS
@@ -733,6 +734,13 @@ endif
 	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) VMSuni.opt;
 	@echo "`translate $@`" > $(@:$(DLL_SUFFIX)=.vms)
 endif
+else # OS2
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+	$(MKSHLIB) /FREE /DE /NOE /NOL /NOBR /DLL /O:$@ /INC:_dllentry /M $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
+else
+	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
+endif
+endif # OS2
 	chmod +x $@
 	$(MOZ_POST_DSO_LIB_COMMAND) $@
 
@@ -803,8 +811,11 @@ endif #STRICT_CPLUSPLUS_SUFFIX
 %.i: %.c
 	$(CC) -C -E $(COMPILE_CFLAGS) $< > $*.i
 
+# need 3 separate lines for OS/2
 %: %.pl
-	rm -f $@; cp $< $@; chmod +x $@
+	rm -f $@
+	cp $< $@
+	chmod +x $@
 
 %: %.sh
 	rm -f $@; cp $< $@; chmod +x $@

mozilla/extensions/psm-glue/src/Makefile.in

@@ -53,7 +53,7 @@ EXTRA_DSO_LDOPTS = \
 	$(MOZ_COMPONENT_LIBS) \
 	-lcmt \
 	-lprotocol \
-	-lmozjs \
+	$(MOZ_JS_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/htmlparser/src/Makefile.in

@@ -22,7 +22,7 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= .:@srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -125,5 +125,4 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTMLPARS -DXML_DTD
 
-INCLUDES	+= -I.
 

mozilla/js/src/Makefile.in

@@ -123,7 +123,7 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-FDLIBM_LIBRARY	= fdlibm/libfdm.a
+FDLIBM_LIBRARY	= fdlibm/libfdm.$(LIB_SUFFIX)
 JSMATH_PRELINK	= jsmathtemp.o
 JS_SAFE_ARENA	= 1
 
@@ -136,6 +136,7 @@ DASH_R		= -r
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),OS2)
+ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 ifndef XCFLAGS
 OS2_IMPLIB	= 1
 LIBRARY		= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
@@ -146,6 +147,7 @@ EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA) libjs.lib
 endif
 OS_CFLAGS	+= -tm-
 endif
+endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
 
@@ -154,6 +156,12 @@ ifdef NS_USE_NATIVE
 ASFILES		= $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s))
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+DEF_OBJS = jsapi.o jsarena.o jsdbgapi.o jsdtoa.o jsgc.o jshash.o \
+	jsinterp.o jslog2.o jslong.o jsprf.o jsutil.o jsxdrapi.o prmjtime.o
+#ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >>$(DEF_FILE)
+endif
+
 ifndef BUILD_OPT
 MOCHAFILE	= 1
 endif
@@ -180,7 +188,7 @@ INCLUDES	+= -I$(srcdir)
 
 GARBAGE		+= $(JSMATH_PRELINK) jscpucfg.o jsautocfg.h jsautocfg.tmp jscpucfg
 
-TARGETS		+= jscpucfg
+TARGETS		+= jscpucfg$(BIN_SUFFIX)
 
 ifdef JS_SAFE_ARENA
 DEFINES		+= -DJS_USE_SAFE_ARENA
@@ -257,6 +265,9 @@ OBJS		+= fdlibm/*.o
 endif
 endif
 
+# OS/2 linkers expect to create executables or dlls, not object files
+# so we pull in what's needed from fdlibm when creating the js dll
+ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 # special rule for jsmath.o since we want to incrementally link
 # against fdlibm to pull in only what is needed
 jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
@@ -271,11 +282,12 @@ else
 endif
 
 $(JSMATH_PRELINK): jsmath.c
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 	$(CC) -Fo$@ -c $(CFLAGS) $<
 else
 	$(CC) -o $@ -c $(COMPILE_CFLAGS) $<
 endif
+endif
 
 # An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
 # This suppresses optimization for this single compilation unit.
@@ -291,7 +303,7 @@ $(FDLIBM_LIBRARY):
 
 jsopcode.h jsopcode.c: jsopcode.tbl
 
-jsautocfg.h: jscpucfg
+jsautocfg.h: jscpucfg$(BIN_SUFFIX)
 	@rm -f $@ jsautocfg.tmp
 	./jscpucfg > jsautocfg.tmp
 	mv jsautocfg.tmp $@
@@ -313,9 +325,13 @@ jscpucfg: jscpucfg.o
 	$(HOST_CC) $(HOST_CFLAGS) $(DEFINES) -o $@ $<
 endif
 else
-jscpucfg: jscpucfg.c
+jscpucfg$(BIN_SUFFIX): jscpucfg.c
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+       $(HOST_CC) $(HOST_CFLAGS) $(DEFINES) $(NSPR_CFLAGS) /Fe$@ $<
+else
 	$(HOST_CC) $(HOST_CFLAGS) $(DEFINES) $(NSPR_CFLAGS) -o $@ $<
 endif
+endif
 
 export:: jsautocfg.h
 	$(INSTALL) -m 444 $< $(PUBLIC)

mozilla/mailnews/imap/tests/harness/Makefile.in

@@ -37,6 +37,8 @@ else
 EXTRA_DSO_LIBS	= msgbaseutil
 endif
 
+EXTRA_DSO_LIBS	+= msgimap_s rdfutil_s
+
 LIBS =	\
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \

mozilla/parser/htmlparser/src/Makefile.in

@@ -22,7 +22,7 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= .:@srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -125,5 +125,4 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTMLPARS -DXML_DTD
 
-INCLUDES	+= -I.
 

mozilla/xpfe/appshell/src/Makefile.in

@@ -51,9 +51,14 @@ CPPSRCS		= \
 		nsCommonDialogs.cpp \
 		nsAbout.cpp \
 		nsAppShellFactory.cpp \
-	        nsUserInfoUnix.cpp \
 		$(NULL)
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS	+= nsUserInfoOS2.cpp
+else
+CPPSRCS	+= nsUserInfoUnix.cpp
+endif
+
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(EXTRA_DSO_LIBS) \

mozilla/xpfe/components/directory/Makefile.in

@@ -52,7 +52,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/find/src/Makefile.in

@@ -36,7 +36,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 

mozilla/xpfe/components/xfer/src/Makefile.in

@@ -38,7 +38,7 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \
-		-lmozjs \
+		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)