Cleanup the GTK support.

webshell/tests/viewer/Makefile

@@ -19,33 +19,61 @@ DEPTH=../../..
 
 include $(DEPTH)/config/config.mk
 
+ifeq ($(USE_NGLAYOUT_GTK),1)
+
+	TOOLKIT_GFX_LIB     = -lgfxgtk
+	TOOLKIT_WIDGET_LIB  = -lwidgetgtk
+	TOOLKIT_BASE_LIB    = -lgmbasegtk
+
+	TOOLKIT_CFLAGS = \
+		-DWIDGET_DLL=\"libwidgetgtk.so\" \
+		-DGFXWIN_DLL=\"libgfxgtk.so\"
+
+	TOOLKIT_CPPSRCS = \
+		nsGTKMain.cpp \
+		nsGTKMenu.cpp
+
+	TOOLKIT_INCLUDES = $(shell gtk-config --cflags)
+
+else
+
+	TOOLKIT_GFX_LIB        = -lgfxmotif
+	TOOLKIT_WIDGET_LIB     = -lwidgetmotif
+	TOOLKIT_BASE_LIB = -lgmbasemotif
+
+	TOOLKIT_CFLAGS = \
+		-DWIDGET_DLL=\"libwidgetmotif.so\" \
+		-DGFXWIN_DLL=\"libgfxmotif.so\"
+
+	TOOLKIT_CPPSRCS = \
+			nsMotifMenu.cpp \
+			nsUnixMain.cpp
+
+endif
+
 CPPSRCS = \
+	$(TOOLKIT_CPPSRCS) \
 	nsBrowserWindow.cpp     \
 	nsEditorMode.cpp        \
 	nsEditorInterfaces.cpp  \
-	nsMotifMenu.cpp         \
 	nsSetupRegistry.cpp     \
-	nsUnixMain.cpp          \
 	nsViewerApp.cpp         \
 	nsWebCrawler.cpp        \
 	nsStubs.cpp             \
 	$(NULL)
 
-INCLUDES+= -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom  -I$(PUBLIC)/dom \
-	-I$(PUBLIC)/netlib -I$(PUBLIC)/js -I$(PUBLIC)/pref -I$(PUBLIC)/network -I$(PUBLIC)/xp
+INCLUDES += \
+			-I$(PUBLIC)/raptor \
+			-I$(PUBLIC)/xpcom \
+			-I$(PUBLIC)/dom \
+			-I$(PUBLIC)/netlib \
+			-I$(PUBLIC)/js \
+			-I$(PUBLIC)/pref \
+			-I$(PUBLIC)/network \
+			-I$(PUBLIC)/xp
 
 OBJS    = $(CPPSRCS:.cpp=.o)
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-	GFX_LIB    = -lgfxgtk
-	WIDGET_LIB = -lwidgetgtk
-	BASE_DSO_FLAGS = -lgmbasegtk
-else
-	GFX_LIB    = -lgfxmotif
-	WIDGET_LIB = -lwidgetmotif
-	BASE_DSO_FLAGS = -lgmbasemotif
-endif
-
 ifdef MOZ_OJI
 	JSJ_LIB = -ljsj
 endif
@@ -56,12 +84,12 @@ EX_LIBS = \
 	-lpng \
 	-lpref \
 	-lraptorbase \
-	$(WIDGET_LIB) \
+	$(TOOLKIT_WIDGET_LIB) \
 	-lraptorgfx \
-	$(GFX_LIB) \
+	$(TOOLKIT_GFX_LIB) \
 	-lraptorhtml \
 	$(DIST)/lib/libraptorhtmlforms_s.a \
-	$(BASE_DSO_FLAGS) \
+	$(TOOLKIT_BASE_LIB) \
 	-lraptorhtmlpars \
 	-lraptorview \
 	-lreg \

webshell/tests/viewer/Makefile.in

@@ -24,7 +24,40 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
+ifeq ($(USE_NGLAYOUT_GTK),1)
+
+	TOOLKIT_GFX_LIB     = -lgfxgtk
+	TOOLKIT_WIDGET_LIB  = -lwidgetgtk
+	TOOLKIT_BASE_LIB    = -lgmbasegtk
+
+	TOOLKIT_CFLAGS = \
+		-DWIDGET_DLL=\"libwidgetgtk.so\" \
+		-DGFXWIN_DLL=\"libgfxgtk.so\"
+
+	TOOLKIT_CPPSRCS = \
+		nsGTKMain.cpp \
+		nsGTKMenu.cpp
+
+	TOOLKIT_INCLUDES = $(shell gtk-config --cflags)
+
+else
+
+	TOOLKIT_GFX_LIB        = -lgfxmotif
+	TOOLKIT_WIDGET_LIB     = -lwidgetmotif
+	TOOLKIT_BASE_LIB = -lgmbasemotif
+
+	TOOLKIT_CFLAGS = \
+		-DWIDGET_DLL=\"libwidgetmotif.so\" \
+		-DGFXWIN_DLL=\"libgfxmotif.so\"
+
+	TOOLKIT_CPPSRCS = \
+			nsMotifMenu.cpp \
+			nsUnixMain.cpp
+
+endif
+
 CPPSRCS = \
+	$(TOOLKIT_CPPSRCS) \
 	nsBrowserWindow.cpp     \
 	nsEditorMode.cpp        \
 	nsEditorInterfaces.cpp  \
@@ -34,36 +67,22 @@ CPPSRCS = \
 	nsStubs.cpp             \
 	$(NULL)
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-CPPSRCS += nsGTKMain.cpp	\
-	   nsGTKMenu.cpp
-CFLAGS += -DWIDGET_DLL=\"libwidgetgtk.so\" -DGFXWIN_DLL=\"libgfxgtk.so\"
-else
-CPPSRCS += nsMotifMenu.cpp         \
-	   nsUnixMain.cpp
-endif
+CFLAGS += $(TOOLKIT_CFLAGS)
 
-INCLUDES+= -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom  -I$(PUBLIC)/dom \
-	-I$(PUBLIC)/netlib -I$(PUBLIC)/js -I$(PUBLIC)/pref -I$(PUBLIC)/network -I$(PUBLIC)/xp
+INCLUDES += \
+			-I$(PUBLIC)/raptor \
+			-I$(PUBLIC)/xpcom \
+			-I$(PUBLIC)/dom \
+			-I$(PUBLIC)/netlib \
+			-I$(PUBLIC)/js \
+			-I$(PUBLIC)/pref \
+			-I$(PUBLIC)/network \
+			-I$(PUBLIC)/xp
 
-INCLUDES += $(FE_X_CFLAGS)
-
-ifeq ($(USE_NGLAYOUT_GTK),1)
-INCLUDES += $(shell gtk-config --cflags)
-endif
+INCLUDES += $(FE_X_CFLAGS) $(TOOLKIT_INCLUDES)
 
 OBJS    = $(CPPSRCS:.cpp=.o)
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-	GFX_LIB    = -lgfxgtk
-	WIDGET_LIB = -lwidgetgtk
-	BASE_DSO_FLAGS = -lgmbasegtk
-else
-	GFX_LIB    = -lgfxmotif
-	WIDGET_LIB = -lwidgetmotif
-	BASE_DSO_FLAGS = -lgmbasemotif
-endif
-
 ifdef MOZ_OJI
 	JSJ_LIB = -ljsj
 endif
@@ -74,12 +93,12 @@ EX_LIBS = \
 	-lpng \
 	-lpref \
 	-lraptorbase \
-	$(WIDGET_LIB) \
+	$(TOOLKIT_WIDGET_LIB) \
 	-lraptorgfx \
-	$(GFX_LIB) \
+	$(TOOLKIT_GFX_LIB) \
 	-lraptorhtml \
 	$(DIST)/lib/libraptorhtmlforms_s.a \
-	$(BASE_DSO_FLAGS) \
+	$(TOOLKIT_BASE_LIB) \
 	-lraptorhtmlpars \
 	-lraptorview \
 	-lreg \