From b78d7ef52a93512f4eab006cddb0d78659128e9a Mon Sep 17 00:00:00 2001
From: "slamm%netscape.com" <slamm%netscape.com>
Date: Wed, 27 Jan 1999 19:51:59 +0000
Subject: [PATCH] Use TK_CFLAGS instead of TK_(MOTIF|GTK)_CFLAGS. Use TK_LIBS
instead of TK_(MOTIF|GTK)_LIBS to simplify makefile rules.
---
base/src/gtk/Makefile.in | 6 +++--
config/autoconf.mk.in | 6 ++---
config/mkdetect/Makefile.in | 2 +-
configure.in | 42 +++++++++++++++++---------------
widget/src/xpwidgets/Makefile.in | 24 ++++++------------
xpfe/bootstrap/Makefile.in | 2 --
6 files changed, 37 insertions(+), 45 deletions(-)
diff --git a/base/src/gtk/Makefile.in b/base/src/gtk/Makefile.in
index 1f76787cdf41..e976bd2145f6 100644
--- a/base/src/gtk/Makefile.in
+++ b/base/src/gtk/Makefile.in
@@ -32,6 +32,8 @@ DEFINES += -D_IMPL_NS_WIDGET
CPPSRCS = nsTimer.cpp
-include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/config/config.mk
-CFLAGS += $(TK_GTK_CFLAGS)
+CFLAGS += $(TK_CFLAGS)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 9a6562297c14..d60b88e729aa 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -117,10 +117,8 @@ DLL_SUFFIX = @DLL_SUFFIX@
endif
GTK_CONFIG = @GTK_CONFIG@
-TK_MOTIF_CFLAGS = @TK_MOTIF_CFLAGS@
-TK_MOTIF_LIBS = @TK_MOTIF_LIBS@
-TK_GTK_CFLAGS = @TK_GTK_CFLAGS@
-TK_GTK_LIBS = @TK_GTK_LIBS@
+TK_CFLAGS = @TK_CFLAGS@
+TK_LIBS = @TK_LIBS@
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
diff --git a/config/mkdetect/Makefile.in b/config/mkdetect/Makefile.in
index 91465167b003..db58dcc619ee 100644
--- a/config/mkdetect/Makefile.in
+++ b/config/mkdetect/Makefile.in
@@ -155,7 +155,7 @@ endif
## Motif
##
-ifdef TK_MOTIF_LIBS
+ifeq ($(MOZ_TOOLKIT),motif)
##
## Set the motif include flags
diff --git a/configure.in b/configure.in
index 814ab0fca9ce..ac2297332bf1 100644
--- a/configure.in
+++ b/configure.in
@@ -599,15 +599,15 @@ fi
LDFLAGS="$XLDFLAGS $LDFLAGS"
if [ test "$MOTIF_REQUIRES_XPM" = "True" ]; then
AC_CHECK_LIB(Xpm, XpmWriteFileFromImage,
- TK_MOTIF_LIBS="-lXpm $TK_MOTIF_LIBS",
+ TK_LIBS="-lXpm $TK_LIBS",
[MISSING_MOTIF="-lXpm $MISSING_MOTIF"], $XLIBS)
fi
if [ test "$MOTIF_VERSION" = "2.1" ]; then
AC_CHECK_LIB(Xp, XpGetPrinterList,
- TK_MOTIF_LIBS="-lXp $TK_MOTIF_LIBS",
+ TK_LIBS="-lXp $TK_LIBS",
[MISSING_MOTIF="-lXp $MISSING_MOTIF"], $XLIBS)
fi
- TK_MOTIF_LIBS="$XLDFLAGS $TK_MOTIF_LIBS"
+ TK_LIBS="$XLDFLAGS $TK_LIBS"
LDFLAGS="$_SAVE_LDFLAGS"
fi
@@ -640,18 +640,18 @@ fi
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS"
AC_CHECK_LIB(Xm, XmStringCreate,
- TK_MOTIF_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $TK_MOTIF_LIBS",
+ TK_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $TK_LIBS",
[MISSING_MOTIF="$MOTIF_DYNAMIC_FLAGS $MISSING_MOTIF"],
- $MOTIF_DYNAMIC_PATHS $TK_MOTIF_LIBS $XLIBS)
+ $MOTIF_DYNAMIC_PATHS $TK_LIBS $XLIBS)
LDFLAGS="$_SAVE_LDFLAGS"
else
AC_CHECK_LIB(Xm, XmStringCreate,
- TK_MOTIF_LIBS="$MOTIF_STATIC_FLAGS $TK_MOTIF_LIBS",
+ TK_LIBS="$MOTIF_STATIC_FLAGS $TK_LIBS",
[MISSING_MOTIF="$MOTIF_STATIC_FLAGS $MISSING_MOTIF"],
- $TK_MOTIF_LIBS $XLIBS)
+ $TK_LIBS $XLIBS)
fi
- TK_MOTIF_CFLAGS="$MOTIF_INCLUDES"
+ TK_CFLAGS="$MOTIF_INCLUDES"
fi
res=`echo :$MOZ_TOOLKIT | grep -c "gtk"`
@@ -664,7 +664,7 @@ if [ test $res != 0 ]; then
sysstaticgtk=$withval)
if [ test "$sysstaticgtk" != "yes" ]; then
- TK_GTK_LIBS=$GTK_LIBS
+ TK_LIBS=$GTK_LIBS
else
changequote(,)
@@ -685,22 +685,20 @@ if [ test $res != 0 ]; then
changequote([,])
- TK_GTK_LIBS="$GTK_STATIC_LOC/lib${GTK_STATIC}.a"
- TK_GTK_LIBS="$TK_GTK_LIBS $GTK_STATIC_LOC/lib${GDK_STATIC}.a"
- TK_GTK_LIBS="$TK_GTK_LIBS $GLIB_STATIC_LOC/lib${GMODULE_STATIC}.a"
- TK_GTK_LIBS="$TK_GTK_LIBS $GLIB_STATIC_LOC/lib${GLIB_STATIC}.a"
- TK_GTK_LIBS="$TK_GTK_LIBS $GTK_LIBS_LOC $GTK_OTHER_LIBS"
+ TK_LIBS="$GTK_STATIC_LOC/lib${GTK_STATIC}.a"
+ TK_LIBS="$TK_LIBS $GTK_STATIC_LOC/lib${GDK_STATIC}.a"
+ TK_LIBS="$TK_LIBS $GLIB_STATIC_LOC/lib${GMODULE_STATIC}.a"
+ TK_LIBS="$TK_LIBS $GLIB_STATIC_LOC/lib${GLIB_STATIC}.a"
+ TK_LIBS="$TK_LIBS $GTK_LIBS_LOC $GTK_OTHER_LIBS"
fi
- TK_GTK_CFLAGS=$GTK_CFLAGS
+ TK_CFLAGS=$GTK_CFLAGS
fi
fi # $no_x
AC_SUBST(GTK_CONFIG)
-AC_SUBST(TK_GTK_CFLAGS)
-AC_SUBST(TK_GTK_LIBS)
-AC_SUBST(TK_MOTIF_CFLAGS)
-AC_SUBST(TK_MOTIF_LIBS)
+AC_SUBST(TK_CFLAGS)
+AC_SUBST(TK_LIBS)
XCFLAGS="$X_CFLAGS"
@@ -1264,7 +1262,11 @@ dnl xpfe/xpviewer/public/Makefile
xpfe/appshell/Makefile
xpfe/appshell/src/Makefile
xpfe/appshell/public/Makefile
-xpfe/bootstrap/Makefile"
+xpfe/bootstrap/Makefile
+xpfe/browser/Makefile
+xpfe/browser/src/Makefile
+dnl xpfe/browser/public/Makefile
+"
EDITOR_MAKEFILES="
editor/base/Makefile
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 821a348bc5ac..fd42561378f9 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -22,22 +22,12 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-
LIBRARY_NAME = raptorbasewidget_s
+#REQUIRES=util img xpcom raptor netlib dom js
+#MODULES=widget
#LCFLAGS=-D_IMPL_NS_WIDGET
-INCLUDES += -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../$(MOZ_TOOLKIT) -I$(srcdir)
-
-ifneq (,$(filter gtk, $(MOZ_TOOLKIT)))
-CFLAGS += $(TK_GTK_CFLAGS)
-else
-ifneq (,$(filter motif, $(MOZ_TOOLKIT)))
-CFLAGS += $(TK_MOTIF_CFLAGS)
-endif
-endif
-
CPPSRCS=nsBaseWidget.cpp \
nsMenuButton.cpp \
nsToolbarItemHolder.cpp \
@@ -54,12 +44,14 @@ CPPSRCS=nsBaseWidget.cpp \
nsTreeView.cpp \
$(NULL)
-MODULE=widget
+LOCAL_INCLUDES := \
+ -I$(srcdir)/../$(MOZ_TOOLKIT) \
+ -I$(srcdir) \
+ $(NULL)
-REQUIRES=util img xpcom raptor netlib dom js
-
-TARGETS = $(LIBRARY)
+include $(topsrcdir)/config/config.mk
+CFLAGS += $(TK_CFLAGS)
MKSHLIB :=
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 61b1d91d515a..1c942bca0bfc 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -34,8 +34,6 @@ TOOLKIT_GFX_LIB = -lgfx$(MOZ_TOOLKIT)
TOOLKIT_WIDGET_LIB = -lwidget$(MOZ_TOOLKIT)
TOOLKIT_BASE_LIB = -lgmbase$(MOZ_TOOLKIT)
-TK_LIBS = $(TK_MOTIF_LIBS) $(TK_GTK_LIBS)
-
EXPORT_TOOLBAR = \
DialogAddrIcon.gif \
DialogAddrIcon_mo.gif \