OS/2 specific Makefile changes. Bug #34106 a=leaf

gfx/src/os2/Makefile.in

@@ -28,8 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= raptor
-OS2_LIBRARYNAME	= gfx_os2
-OS2_IMPLIB	= 1
+LIBRARY_NAME	= gfx_os2
 
 REQUIRES	= util img xpcom raptor dom netlib java js
 
@@ -50,7 +49,19 @@ CPPSRCS		= \
 
 RES_FILE	= $(srcdir)/libprint.res
 
-OS2_LIBS	= nggfx img mozjs mozutil netlib xpcom
+EXTRA_DSO_LIBS	= nggfx img_s mozutil_s
+
+EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+OS_LIBS += libconv.lib
+else
+OS_LIBS += -luconv
+endif
 
 include $(topsrcdir)/config/rules.mk
 
@@ -58,7 +69,7 @@ DEFINES		+= -D_IMPL_NS_GFXONXP
 
 INCLUDES	+= -I$(topsrcdir)/gfx/src
 
-OS_LIBS		+= $(NSPR_LIBS) -luconv
+OS_LIBS		+= $(NSPR_LIBS)
 
 # This adds the resources for the print dialog to the gfxos2 dll.
 # I guess eventually we ought to use an xml dialog...

intl/locale/src/os2/Makefile.in

@@ -24,11 +24,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= locale
-LIBRARY_NAME	= nglocale
+LIBRARY_NAME	= nslocale
 IS_COMPONENT	= 1
-OS2_IMPLIB	= 1
-OS2_LIBRARYNAME	= nglocale
-OS2_LIBS	= libuni xpcom ngbase libnslocale_s
+EXTRA_DSO_LIBS	= nslocale_s
 
 REQUIRES	= xpcom unicharutil
 
@@ -38,13 +36,22 @@ CPPSRCS		= \
 		nsCollationOS2.cpp \
 		nsDateTimeFormatOS2.cpp \
 		nsLocaleDllOS2.cpp \
+		nsLocaleModule.cpp \
 		$(NULL)
 
-EXPORTS		= nsILocaleOS2.h
+EXTRA_DSO_LDOPTS = $(EXTRA_DSO_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(NULL)
+
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+EXTRA_DSO_LDOPTS += libuls.lib
+else
+EXTRA_DSO_LDOPTS += -llibuni
+endif
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= $(srcdir) $(srcdir)/..
+INCLUDES	+= $(srcdir)/..
 
 OS_LIBS		+= $(NSPR_LIBS)
 

widget/src/os2/Makefile.in

@@ -23,7 +23,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= widget_os2
+LIBRARY_NAME	= wdgtos2
+
+EXTRA_DSO_LIBS	= nggfx
 
 REQUIRES	= util img xpcom raptor netlib
 
@@ -40,11 +42,9 @@ CPPSRCS		= \
 		nsBaseList.cpp \
 		nsCanvas.cpp \
 		nsCheckbutton.cpp \
-		nsClipboard.cpp \
 		nsCombobox.cpp \
 		nsContextMenu.cpp \
 		nsDirPicker.cpp \
-		nsDragService.cpp \
 		nsEntryField.cpp \
 		nsFSTree.cpp \
 		nsFileDialog.cpp \
@@ -62,25 +62,38 @@ CPPSRCS		= \
 		nsRadiobutton.cpp \
 		nsScrollbar.cpp \
 		nsSound.cpp \
-		nsTabWidget.cpp \
 		nsTextArea.cpp \
 		nsToolkit.cpp \
 		nsTooltipManager.cpp \
-		nsTooltipWidget.cpp \
 		nsWidgetFactory.cpp \
 		nsWindow.cpp \
 		$(NULL)
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+# XXX FILES temporarily removed
+#		nsClipboard.cpp \
+#		nsDragService.cpp \
+
+# nsITabWidget and nsITooltipWidget appear to have been scrapped
+#		nsTabWidget.cpp \
+#		nsTooltipWidget.cpp \
+
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		$(TOOLKIT_DSO_LDOPTS) \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		$(TK_LIBS) \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_TIMER_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+OS_LIBS += libuls.lib libconv.lib unikbd.lib
+else
+OS_LIBS += -llibuni -luconv -lunikbd
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)

widget/timer/src/os2/Makefile.in

@@ -25,15 +25,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+IS_COMPONENT	= 1
 MODULE		= timer
-LIBRARY_NAME	= timer_s
+LIBRARY_NAME	= timer
 
 REQUIRES	= xpcom
 
-CPPSRCS		= nsTimer.cpp
+CPPSRCS		= nsTimerOS2.cpp
 
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk