From 6b9ca2b48224bc54efd1e55f17597f7813c43367 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Tue, 26 Jan 1999 07:48:13 +0000
Subject: [PATCH] Use logic in rules.mk for -DWIDGET_DLL and -DGFXWIN_DLL
 defines; nuked unnecessary INCLUDES addition; renamed nsUnixMain.cpp to
 nsMotifMain.cpp to be consistant with the Gtk naming here.

---
 webshell/tests/viewer/Makefile.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index 623b85534ac5..16e11c23fc41 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -30,28 +30,28 @@ TOOLKIT_GFX_LIB		= $(addprefix -lgfx, $(MOZ_TOOLKIT))
 TOOLKIT_WIDGET_LIB	= $(addprefix -lwidget, $(MOZ_TOOLKIT))
 TOOLKIT_BASE_LIB	= $(addprefix -lgmbase, $(MOZ_TOOLKIT))
 
-ifneq (,$(filter gtk,$(MOZ_TOOLKIT)))
+
+#
+# Hardcoding dlopen()'s?  This needs to get fixed.
+#
 TOOLKIT_CFLAGS = \
-	-DWIDGET_DLL=\"libwidgetgtk.so\" \
-	-DGFXWIN_DLL=\"libgfxgtk.so\"
+-DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
+-DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\"
+
+ifneq (,$(filter gtk,$(MOZ_TOOLKIT)))
 
 TOOLKIT_CPPSRCS = \
 	nsGTKMain.cpp \
 	nsGTKMenu.cpp
 
-INCLUDES += -I$(topsrcdir)/widget/src/gtk
-
 TOOLKIT_CFLAGS += $(TK_GTK_CFLAGS)
 TOOLKIT_LIBS   = $(TK_GTK_LIBS)
 else
 ifneq (,$(filter motif,$(MOZ_TOOLKIT)))
-TOOLKIT_CFLAGS = \
-	-DWIDGET_DLL=\"libwidgetmotif.so\" \
-	-DGFXWIN_DLL=\"libgfxmotif.so\"
 
 TOOLKIT_CPPSRCS = \
 	nsMotifMenu.cpp \
-	nsUnixMain.cpp
+	nsMotifMain.cpp
 
 TOOLKIT_CFLAGS += $(TK_MOTIF_CFLAGS)
 TOOLKIT_LIBS   = $(TK_MOTIF_LIBS)