Index: toolkit/components/remote/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/remote/Makefile.in,v
retrieving revision 1.2
diff -u -8 -r1.2 Makefile.in
--- toolkit/components/remote/Makefile.in	4 Apr 2005 19:52:26 -0000	1.2
+++ toolkit/components/remote/Makefile.in	4 Apr 2005 20:34:26 -0000
@@ -69,15 +69,10 @@
 endif
 
 ifeq (photon,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += nsPhMozRemoteHelper.cpp
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-CXXFLAGS += $(MOZ_GTK2_CFLAGS)
-endif
-
-ifeq (gtk,$(MOZ_WIDGET_TOOLKIT))
-CXXFLAGS += $(MOZ_GTK_CFLAGS)
-endif
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(TK_LIBS)
+CXXFLAGS += $(TK_CFLAGS)