r=cls, a=brendan

Because of the raptor to gk change, we don't need SHORT_LIBNAME

layout/build/Makefile.in

@@ -34,11 +34,7 @@ SHORT_LIBNAME	= nglayout
 IS_COMPONENT	= 1
 EXTRA_DSO_LIBS	= jsdom
 
-ifeq ($(USE_SHORT_LIBNAME),1)
-EXTRA_DSO_LIBS	+= nggfx
-else
 EXTRA_DSO_LIBS	+= gkgfx
-endif
 
 
 CPPSRCS		= \

layout/html/tests/Makefile.in

@@ -36,11 +36,7 @@ CPPSRCS		= \
 
 LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 
-ifeq ($(USE_SHORT_LIBNAME),1)
-EXTRA_DSO_LIBS += nggfx
-else
 EXTRA_DSO_LIBS += gkgfx
-endif
 
 EXTRA_DSO_LIBS += jsdom
 

view/src/Makefile.in

@@ -31,11 +31,7 @@ LIBRARY_NAME	= gkview
 SHORT_LIBNAME	= ngview
 IS_COMPONENT    = 1
 
-ifeq ($(USE_SHORT_LIBNAME),1)
-EXTRA_DSO_LIBS = nggfx
-else
 EXTRA_DSO_LIBS = gkgfx
-endif
 
 CPPSRCS		= \
 		nsView.cpp \

widget/src/os2/Makefile.in

@@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= wdgtos2
 
-EXTRA_DSO_LIBS	= nggfx
+EXTRA_DSO_LIBS	= gkgfx
 
 REQUIRES	= util img xpcom raptor netlib