Clean-up Makefile and bring it more in line with GTK version.

gfx/src/photon/Makefile.in

@@ -46,6 +46,21 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
+
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+CXXFLAGS	+= $(TK_CFLAGS)
+CFLAGS		+= $(TK_CFLAGS)
+
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+		-lraptorgfx \
+		$(NULL)
+
+DEFINES		+= -D_IMPL_NS_GFXNONXP
+
+INCLUDES	+= \
+		-I$(srcdir)/. \
+		-I$(srcdir)/.. \
+		$(NULL)
+
+