From 9854b8937b01b6a98955f3e48fd76510163f0dd0 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 6 Dec 2001 10:32:10 +0000 Subject: [PATCH] Fix bustage that occurs when building with multiple toolkits but not having gtk as the default toolkit. git-svn-id: svn://10.0.0.236/trunk@109829 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/xmlterm/base/Makefile.in | 3 ++- mozilla/extensions/xmlterm/base/mozLineTerm.h | 3 +++ mozilla/extensions/xmlterm/build/Makefile.in | 4 ++-- mozilla/modules/plugin/samples/simple/Makefile.in | 15 +++++++-------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mozilla/extensions/xmlterm/base/Makefile.in b/mozilla/extensions/xmlterm/base/Makefile.in index 93428559f76..028645a1e0d 100644 --- a/mozilla/extensions/xmlterm/base/Makefile.in +++ b/mozilla/extensions/xmlterm/base/Makefile.in @@ -45,7 +45,6 @@ DEBUG_LTERM = 1 endif # Defines -DEFINES += $(TK_CFLAGS) ifdef DEBUG_LTERM DEFINES += -DDEBUG_LTERM endif @@ -102,6 +101,8 @@ include $(srcdir)/../config/xmlterm_config.mk include $(topsrcdir)/config/rules.mk +CXXFLAGS += $(MOZ_GTK_CFLAGS) + ifndef STAND_ALONE ifeq ($(OS_ARCH),Linux) OS_CFLAGS += -ansi diff --git a/mozilla/extensions/xmlterm/base/mozLineTerm.h b/mozilla/extensions/xmlterm/base/mozLineTerm.h index dded1d28ef3..885baee94af 100644 --- a/mozilla/extensions/xmlterm/base/mozLineTerm.h +++ b/mozilla/extensions/xmlterm/base/mozLineTerm.h @@ -35,6 +35,9 @@ #include "mozILineTerm.h" #include "lineterm.h" +#include +#include + #define MAXCOL 4096 // Maximum columns in line buffer class mozLineTerm : public mozILineTermAux diff --git a/mozilla/extensions/xmlterm/build/Makefile.in b/mozilla/extensions/xmlterm/build/Makefile.in index 1d54c6f2868..cfbb6bdbc81 100644 --- a/mozilla/extensions/xmlterm/build/Makefile.in +++ b/mozilla/extensions/xmlterm/build/Makefile.in @@ -67,8 +67,6 @@ REQUIRES = xpcom \ MODULE_NAME = mozXMLTermModule -DEFINES += $(TK_CFLAGS) - CPPSRCS = mozXMLTermModule.cpp SHARED_LIBRARY_LIBS = \ @@ -90,6 +88,8 @@ include $(srcdir)/../config/xmlterm_config.mk include $(topsrcdir)/config/rules.mk +CXXFLAGS += $(MOZ_GTK_CFLAGS) + PLATFORM_STR = unknown # Edit the lines below as needed, depending upon your platform(s) diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in index f3cde652769..56e1abb3e38 100644 --- a/mozilla/modules/plugin/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/samples/simple/Makefile.in @@ -43,17 +43,16 @@ CPPSRCS = npsimple.cpp LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_XPCOM_LIBS) -L$(DIST)/lib - -ifdef MOZ_ENABLE_GTK -EXTRA_DSO_LDOPTS += -lgtksuperwin -endif - -EXTRA_DSO_LDOPTS += $(TK_LIBS) +EXTRA_DSO_LDOPTS += \ + -L$(DIST)/lib \ + -lgtksuperwin \ + $(MOZ_COMPONENT_XPCOM_LIBS) \ + $(MOZ_GTK_LDFLAGS) \ + $(NULL) include $(topsrcdir)/config/rules.mk -CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) +CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) $(MOZ_GTK_CFLAGS) libs:: $(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples