From 022c21a37f88014bfafdb9b9beb65045bfc4b6fc Mon Sep 17 00:00:00 2001
From: "ramiro%netscape.com" <ramiro%netscape.com>
Date: Sun, 18 Jul 1999 06:19:48 +0000
Subject: [PATCH] Fix some of the carnage.

---
 widget/src/beos/Makefile.in   | 4 ++--
 widget/src/gtk/Makefile.in    | 4 ++--
 widget/src/motif/Makefile.in  | 3 ++-
 widget/src/os2/Makefile.in    | 4 ++--
 widget/src/photon/Makefile.in | 4 ++--
 widget/src/xlib/Makefile.in   | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/widget/src/beos/Makefile.in b/widget/src/beos/Makefile.in
index b48571f7484d..cad359083b73 100644
--- a/widget/src/beos/Makefile.in
+++ b/widget/src/beos/Makefile.in
@@ -28,8 +28,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
-
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/.
@@ -68,6 +66,8 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
diff --git a/widget/src/gtk/Makefile.in b/widget/src/gtk/Makefile.in
index c825933503a2..409aab5c0d9c 100644
--- a/widget/src/gtk/Makefile.in
+++ b/widget/src/gtk/Makefile.in
@@ -28,7 +28,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
 
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
@@ -68,6 +67,8 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
@@ -98,4 +99,3 @@ $(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
 else
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 endif
-
diff --git a/widget/src/motif/Makefile.in b/widget/src/motif/Makefile.in
index e4904050ed84..1cf2ae39b005 100644
--- a/widget/src/motif/Makefile.in
+++ b/widget/src/motif/Makefile.in
@@ -28,7 +28,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
 
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
@@ -62,6 +61,8 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
diff --git a/widget/src/os2/Makefile.in b/widget/src/os2/Makefile.in
index 1e3ddbd180d5..27ccd1661092 100644
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -32,8 +32,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
-
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/.
@@ -84,6 +82,8 @@ CSRCS = tabctrl.c
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
diff --git a/widget/src/photon/Makefile.in b/widget/src/photon/Makefile.in
index 9883b1d824f7..c940bb2fbeb2 100644
--- a/widget/src/photon/Makefile.in
+++ b/widget/src/photon/Makefile.in
@@ -28,8 +28,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
-
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/.
@@ -64,6 +62,8 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)
diff --git a/widget/src/xlib/Makefile.in b/widget/src/xlib/Makefile.in
index fc4509b872e7..099aa6f8a7f0 100644
--- a/widget/src/xlib/Makefile.in
+++ b/widget/src/xlib/Makefile.in
@@ -28,8 +28,6 @@ REQUIRES=util img xpcom raptor netlib
 
 DEFINES += -D_IMPL_NS_WIDGET 
 
-CXXFLAGS += $(TK_CFLAGS)
-
 DEFINES += \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/.
@@ -69,6 +67,8 @@ endif
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS += $(TK_CFLAGS)
+
 SHARED_LIBRARY_LIBS =			    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
 	$(NULL)